reverts 3 changes to locking
a8aead0ac6e2fdcdb77cf8de738e6f5ed00b0545
7aa132c8087193f3efa23867b8783a0b7ad5a267
22b368a74b36896de6b164c55cd4b3b9ca562bb2