According to the discussion in #923, it seems like this should be the
only way to fix this encoding debug issue. I'm also going to coordinate
with aws-sdk to get this fix in the upstream.

Fixes #923, #301