[PATCH 5/9] Revert "aws-setup: Fixes bug12763"