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