Revert r188644 to unbreak buildbots.