Revert "avoid a race condition"

This reverts commit 78a70e5bee9a09e0c0f502651d2b617ccbad2cf8.