Fixing broken bots after r238505.