Switched uploads from direct to s3 to server to s3