antoniop
committed
on 04 Jan
Port from downstream a more failsafe cleanup in the importer