Revert "Fixes I18n issue"

This reverts commit fab8ae504993fc90d2a7300a4929cae606d8b2e0.