When they accept it upstream then we won't need a patch, but in the meantime, the approach used in the other riak 1.4.0 submission has a smaller footprint.