Update to the same code Riak is using