Cleaned up the :use_multipart_upload handling in the upload method