Remove some importer optimization for the sake of legibility