Revert 0aa1a2c..ba8eff8

This rolls back to commit 0aa1a2cd09b86c8f3f07a1693cca785900c9282e.
Amazon Cloud