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