Temporarily revert r104655 as it's breaking the bots.