This reverts commit c256347cee on staging. The issue was fixed on master in #41790 (aa18847e00) Closes #41869
c256347cee
aa18847e00