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