Fixing an issue that came up while fixing AWS CLI issue below

 https://github.com/aws/aws-cli.../issues/593.