collateral changes to make backported tests from #36476 pass