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