Revert r188150 to un-break the buildbot.