Reverted i18n commits and moved to branch