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