This reverts commit 3001d080 which seems to have introduced a race condition that's failing the build in some cases.