Fix for 1.8.x changes to --set-upstream