Reverted the previous pull-request.

This pull request causes deadlocks under load.