Refactored to remove one unnecessary call to ACL/s3.rb