Fix incompatability with newer(?) AWS client library

See commit message, or GH-1's issue description.