Revert "issue-491: Significant performance improvement for spin lock contention"

This reverts commit e1eaea1cf8750fab74cd4aef1d6d07ad219c9fab.