Made upload new version more consistent with upload

See #2868