Revert "Crap, that didn't make locks any more efficient..."

This reverts commit e479efff78519bb74616d53fb49b774ab9c08297.
Okay, this should now work, be faster then before and not infinite loop.