Further impl of old importer.