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