FIX: 1.9.0 regressions with i18n