fix v3 perf regression from #79636, RT#80177