Actually support multipart uploads that are broken in development branch

A recent fix in the development branch broke the support for multipart uploading.