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