Re-added original regex; included i18n files