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