This reverts commit 024115ab. I suspect that this may be causing some buildbot bootstrapping failures. Revert while I investigate.