Hack code to work-around another riak-core bug