Partial revert of r206229, to get the build bots green again.