Here's the overarching issue: https://github.com/basho/riak_core/issues/572