Remove hack for the aws-sdk org
Merge branch 'aws'