VE-1012 Just change order of operations for upload instead