rolled back s3 changes, as heroku has some annoying timeouts that prevent it from being used anyway