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