This (and a few other less-than-elegant operations) were all handled as part of this:

https://github.com/basho/riak_core/commit/c4b80137998359f0db...