Add general resolver to importer

Rather than commenting "don't drop this", why not put it outside of the block?