Revert part of 186302 to fix buildbots.