Revert to fixed s3 version