Revert "Fix for race condition in ThreadLockServiceImpl"

This reverts commit 22d9e86d52c6d08996fcb890e98056d120bc6388.