Revert "Amazon EC2 API Update"

This reverts commit 77085ad3993b58fb23f5c8cbce5dbe6f9b3bff1e.