Move parameter tweaking code back to import method

Updating and merging fail if the parameter tweaking things are done for
those as well (because the parameters shouldn't exist).