Revert r223239, which broke some bots.