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