Revert "Merge branch 'pregmod-master' into 'pregmod-master'"

This reverts merge request !3006 (merged)

@klorpa

Something from all the changes to setupVars with the big patch is getting lost and causing problems.