Track ex-aws/ex_aws#1245 and revert 5db7d081 if/when the PR is merged and released
Track ex-aws/ex_aws#1245 and revert 5db7d08 if/when the PR is merged and released