Revert "Fix dropping locks on shut down"
Revert "Fix dropping locks on shut down"

This reverts commit 83f1ccfcaba76785ab4bd91e3177724e2dbb85ed.

matrix-org/synapse,matrix-org/synapse,matrix-org/synapse,matrix-org/synapse,matrix-org/synapse,matrix-org/synapse