This reverts commit ab2733761270886327382c8434eadc195950ecc7. Reason: this causes failures in g3 with i18n extraction. See #31267. PR Close #31267
This reverts commit ab2733761270886327382c8434eadc195950ecc7. Reason: this causes failures in g3 with i18n extraction. See #31267. PR Close #31267