Revert r129846; it's breaking a buildbot. See