Should probably fix this, not only for riak.