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