Recommit r244470+ r244471 together, the bot failed between them.