Revert "Slightly safer locking". It's not.

This reverts commit c944f1fe41fd0d6379d4945e2765073868198a10.