revert patch I added in r187655. It still breaks public
buildbot.