Revert "Merge branch 'develop' of git://github.com/garnaat/aws-cli into garnaat-develop"

This reverts commit 31474d4fb63c39c22d54a6cb5f80132912e9a67d, reversing
changes made to c5d7644d1d1a0dd40e3cb4e4dad13390d26dd56d.