Revert r219102 as it caused significant buildbot breakage