Temporarily revert r250345 to sort out bot failure.