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