Revert r184302 on Renato's behalf - it broke the bots and he's asked me to revert as he's unavailable.