diff --git a/src/riak_kv_get_fsm.erl b/src/riak_kv_get_fsm.erl
index fc2aadd285..e4fabc361f 100644
--- a/src/riak_kv_get_fsm.erl
+++ b/src/riak_kv_get_fsm.erl
@@ -193,13 +193,11 @@ prepare(timeout, StateData=#state{bkey=BKey={Bucket,_Key},
             {stop, normal, StateData2};
         _ ->
             StatTracked = proplists:get_value(stat_tracked, BucketProps, false),
-            UpNodes = riak_core_node_watcher:nodes(riak_kv),
             Preflist2 = case proplists:get_value(sloppy_quorum, Options, true) of
                         true ->
+                            UpNodes = riak_core_node_watcher:nodes(riak_kv),
                             riak_core_apl:get_apl_ann(DocIdx, N, UpNodes);
                         false ->
-                            %% TODO: Avoid 2nd call to node_watcher inside the
-                            %%       call to get_primary_apl/3.
                             riak_core_apl:get_primary_apl(DocIdx, N, riak_kv)
                     end,
             new_state_timeout(validate, StateData#state{starttime=riak_core_util:moment(),
diff --git a/src/riak_kv_put_fsm.erl b/src/riak_kv_put_fsm.erl
index 122ae7d639..0a27c834e9 100644
--- a/src/riak_kv_put_fsm.erl
+++ b/src/riak_kv_put_fsm.erl
@@ -227,12 +227,12 @@ prepare(timeout, StateData0 = #state{from = From, robj = RObj,
             process_reply(Error, StateData0);
         _ ->
             StatTracked = proplists:get_value(stat_tracked, BucketProps, false),
-            UpNodes = riak_core_node_watcher:nodes(riak_kv),
             Preflist2 = case proplists:get_value(sloppy_quorum, Options, true) of
                             true ->
+                                UpNodes = riak_core_node_watcher:nodes(riak_kv),
                                 riak_core_apl:get_apl_ann(DocIdx, N, UpNodes);
                             false ->
-                                riak_core_apl:get_primary_apl(DocIdx, N, UpNodes)
+                                riak_core_apl:get_primary_apl(DocIdx, N, riak_kv)
                         end,
             %% Check if this node is in the preference list so it can coordinate
             LocalPL = [IndexNode || {{_Index, Node} = IndexNode, _Type} <- Preflist2,