Revert "Prevent a possible race condition"

This reverts commit c22d56d9dd108fcebb5b2785d3a4e3fd845fa849.