Reinstate go/importer use now that we've frozen go/importer