Revert "More racecondition elimination."
Revert "More racecondition elimination."

This reverts commit d846522e0e8f214c29135e7d5459977d9e3c6b49.

credativUK/vdirsyncer,credativUK/vdirsyncer,mathstuf/vdirsyncer,tribut/vdirsyncer,untitaker/vdirsyncer,hobarrera/vdirsyncer,untitaker/vdirsyncer,hobarrera/vdirsyncer,tribut/vdirsyncer,mathstuf/vdirsyncer,untitaker/vdirsyncer