Switch back to my version of s3

Mitchell hasn't taken my pull request yet.