moar i18n cleanup; avoid trying to double-mount