Rewritten the --prefer-dist tip
Merge pull request #2288 from WouterJ/patch-19

Reverted --prefer-dist tip