Revert commit r186216 -- it's breaking bots: