This reverts commit 0a213e71b3. which needs a better solution to prevent deadlock in case the lock is already taken.
0a213e71b3
6f91dc0799