Revert "Reentrant locking bug fixes."

This reverts commit 8d08ea8d4bbc2214013c3df2f643d283185bcb4a.