revert lock-related MRs

revert !265 (merged) and !270 (merged) for this release

More detailed description

Checklist

• add tests
• label this MR
• assign reviewers
• update documentation and changelog
• link related issues and close with this MR via "closes #"