Get it working again after merging i18n changes