Try to keep up with php_riak trunk