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