Reintroduce dependency on i18n