Revert "More racecondition elimination."

This reverts commit d846522e0e8f214c29135e7d5459977d9e3c6b49.