reverted early changes to s3 api