Revert "Fix for race condition in ThreadLockServiceImpl"

This reverts commit bbfad26b65c687b77d43be6c3cc8ec60bbe89384.