This change was reverted in #13276, is there new reasons to re-add it again, maybe I missed that?