We're passing upgrade to PackageFinder.find_requirement so this won't happen

Fixes #1971