Addressed by https://github.com/basho/riak_core/issues/485