See #8824 (closed) for context, I added a comment explaining the changes and why I didn't change anything for upload.