Revert commit r186217 -- this is breaking bots: