Work-around for https://github.com/basho/riak-erlang-client/issues/151

Fixes/work-around for #146