diff --git a/src/riakc_pb_socket.erl b/src/riakc_pb_socket.erl
index fd361c1e..5cfffea5 100644
--- a/src/riakc_pb_socket.erl
+++ b/src/riakc_pb_socket.erl
@@ -2771,12 +2771,11 @@ process_response(#request{msg = #rpbaaefoldfindkeysreq{}},
         {ok, {keys, lists:map(fun unpack_keycount_fun/1, KeysCount)}},
         State};
 process_response(#request{msg = #rpbaaefoldfindtombsreq{}},
-                    #rpbaaefoldkeycountresp{keys_count = KeysDH},
+                    #rpbaaefoldkeyvalueresp{response_type = <<"clock">>} = Rsp,
                     State) ->
-    %% In this case the integer value in each entry is not a count but a
-    %% delete hash
+    KeysNClocks = Rsp#rpbaaefoldkeyvalueresp.keys_value,
     {reply,
-        {ok, {keys, lists:map(fun unpack_keycount_fun/1, KeysDH)}},
+        {ok, {keysclocks, lists:map(fun unpack_keyclock_fun/1, KeysNClocks)}},
         State};
 process_response(#request{msg = #rpbaaefoldreaptombsreq{}},
                     #rpbaaefoldkeycountresp{response_type = ReapTag,