old S3 code is properly broken now; need to merge in all the storage_s3 code