Revert "SERVER-34622 use existing options in _unbridgedNodes if bridge is enabled"

This reverts commit 0e374292088c87a86fee802160ca2467b81d4620.

2 files changed, 1 insertions, 26 deletions

diff --git a/jstests/noPassthrough/restart_node_with_bridge.js b/jstests/noPassthrough/restart_node_with_bridge.js
deleted file mode 100644
index 7ac33335df6..00000000000
--- a/jstests/noPassthrough/restart_node_with_bridge.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Tests that a node can be successfully restarted when the bridge is enabled.
- * @tags: [requires_persistence]
- */
-(function() {
-    "use strict";
-
-    const name = "restart_node_with_bridge";
-    const rst = new ReplSetTest({name: name, nodes: 1, useBridge: true});
-    rst.startSet();
-    rst.initiate();
-    rst.awaitNodesAgreeOnPrimary();
-
-    let primary = rst.getPrimary();
-    assert.commandWorked(primary.getDB("test").getCollection(name).insert({_id: 1}));
-
-    rst.restart(primary);
-    rst.awaitNodesAgreeOnPrimary();
-    primary = rst.getPrimary();
-    assert.eq(primary.getDB("test").getCollection(name).count({_id: 1}), 1);
-
-    rst.stopSet();
-}());
diff --git a/src/mongo/shell/replsettest.js b/src/mongo/shell/replsettest.js
index c6f56a9fbeb..499715ab18e 100644
--- a/src/mongo/shell/replsettest.js
+++ b/src/mongo/shell/replsettest.js
@@ -1984,9 +1984,7 @@ var ReplSetTest = function(opts) {
 
         // If restarting a node, use its existing options as the defaults.
         if ((options && options.restart) || restart) {
-            const existingOpts =
-                _useBridge ? _unbridgedNodes[n].fullOptions : this.nodes[n].fullOptions;
-            options = Object.merge(existingOpts, options);
+            options = Object.merge(this.nodes[n].fullOptions, options);
         } else {
             options = Object.merge(defaults, options);
         }