Revert r218778 while investigating buldbot breakage.