Revert "SERVER-18845 send our own update first in updatePosition to fix 2.6 compatibilty"

This reverts commit c69158b7fccfc9eb5648a68fcf194fc0cf30ba4d.

1 files changed, 0 insertions, 8 deletions

diff --git a/jstests/multiVersion/w_majority_change.js b/jstests/multiVersion/w_majority_change.js
index 7b508d19e07..e0f79084c56 100644
--- a/jstests/multiVersion/w_majority_change.js
+++ b/jstests/multiVersion/w_majority_change.js
@@ -20,12 +20,6 @@ load("jstests/replsets/rslib.js");
 
     var replTest = new ReplSetTest({name: name, nodes: nodes});
     nodes = replTest.startSet();
-
-    // When processing an updatePosition command, 2.6 goes through the array of updates until it
-    // finds a problematic one and then returns an error. In 3.0, we make sure our update is before
-    // the updates of others to ensure ours is processed even if we lack a handshake from a node for
-    // which we have progress. This does not protect the updates of nodes that sync through us, so
-    // we must have all nodes sync to the primary to ensure their update goes through.
     var config = {_id: name,
                   version: 1,
                   members: [{_id:0, host: nodes[0].host, priority: 3, votes: 1},
@@ -36,7 +30,6 @@ load("jstests/replsets/rslib.js");
                             {_id:5, host: nodes[5].host, votes: 1, arbiterOnly: true},
                             {_id:6, host: nodes[6].host, votes: 1, arbiterOnly: true},
                            ],
-                  settings: { chainingAllowed: false }
                   };
     replTest.initiate(config);
 
@@ -110,7 +103,6 @@ load("jstests/replsets/rslib.js");
                         {_id:5, host: nodes[5].host, priority: 0, votes: 0},
                         {_id:6, host: nodes[6].host, votes: 1, arbiterOnly: true},
                        ],
-              settings: { chainingAllowed: false }
               };
     replTest.initiate(config);