Revert "Even more locking"

This reverts commit 6c21949c543a3205fc6f65c2842bcf6f6544c0b1.