This reverts commit 406f801b70. The reason for the revert is the breakage in i18n subsystem in g3. PR Close #38101
406f801b70