Move to Official AWS Gem (DO NOT MERGE)