Followup from #85575
Followup from #85575