Revert "Workaround another race condition issue"

This reverts commit f44bfad235e63bb792c38e16ae1fbd281ec1453b.
3 files changed