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