[REVERT][runbot] revert a merge change