This reverts commit b6824c9d. This relands commit 0a6c74e2. The original commit was reverted due to buildbot failures. These bots should be updated now, so hopefully this will stick.
