revert 199757 for buildbot breakage.