Don't include this patch in the end -- instead use the one from #18328. But I want to have it in for CI and perf regressions