anchor.diff:      end.
   
   get_handoff_receive_timeout() ->
  -    app_helper:get_env(riak_core, riak_core_handoff_timeout, 60000).
  +    app_helper:get_env(riak_core, handoff_timeout, ?TCP_TIMEOUT).
   
   end_fold_time(StartFoldTime) ->
       EndFoldTime = now(),
  
positive.code:                          lager:debug("~p ~p Sending final sync", [Partition, Module]),
                           ok = TcpMod:send(Socket, <<?PT_MSG_SYNC:8>>),
  
                           case TcpMod:recv(Socket, 0, RecvTimout) of
                               {ok,[?PT_MSG_SYNC|<<"sync">>]} ->
                                   lager:debug("~p ~p Final sync received", [Partition, Module]);
                               {error, timeout} -> exit({shutdown, timeout})
  
negative.code:                     {error, Reason}}) ->
      {Socket, ParentPid, Module, TcpMod, Ack, Total, {error, Reason}};
  visit_item(K, V, {Socket, ParentPid, Module, TcpMod, ?ACK_COUNT, Total, _Err}) ->
      RecvTimeout = get_handoff_receive_timeout(),
      M = <<?PT_MSG_OLDSYNC:8,"sync">>,
      case TcpMod:send(Socket, M) of
          ok ->
              case TcpMod:recv(Socket, 0, RecvTimeout) of
                  {ok,[?PT_MSG_OLDSYNC|<<"sync">>]} ->
                      visit_item(K, V, {Socket, ParentPid, Module, TcpMod, 0, Total, ok});
                  {error, Reason} ->
  