Unreviewed, merge the arguments fix in r118138 to get bots green.