diff --git a/lib/client/gnt_network.py b/lib/client/gnt_network.py
index b07aa7a8ab2a27d7472f2b9b03e12e44200597f5..a51d5119868d5c433f4532c727fc8f9d309aa774 100644
--- a/lib/client/gnt_network.py
+++ b/lib/client/gnt_network.py
@@ -144,8 +144,7 @@ def DisconnectNetwork(opts, args):
   # TODO: Change logic to support "--submit"
   for group in groups:
     op = opcodes.OpNetworkDisconnect(group_name=group,
-                                     network_name=network,
-                                     conflicts_check=opts.conflicts_check)
+                                     network_name=network)
     SubmitOpCode(op, opts=opts, cl=cl)
 
 
@@ -349,7 +348,7 @@ commands = {
   "disconnect": (
     DisconnectNetwork,
     [ArgNetwork(min=1, max=1), ArgGroup()],
-    [NOCONFLICTSCHECK_OPT, PRIORITY_OPT],
+    [PRIORITY_OPT],
     "<network_name> [<node_group>...]",
     "Unmap a given network from a specified node group"),
   "remove": (
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index d14bb65e0a1aa0c98fb6cac6405ef0b9433fc7ef..5798c6fa92e375c57b4cbf2acf3b4a680a2a9fba 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -16811,9 +16811,8 @@ class LUNetworkDisconnect(LogicalUnit):
 
       # Lock instances optimistically, needs verification once group lock has
       # been acquired
-      if self.op.conflicts_check:
-        self.needed_locks[locking.LEVEL_INSTANCE] = \
-          self.cfg.GetNodeGroupInstances(self.group_uuid)
+      self.needed_locks[locking.LEVEL_INSTANCE] = \
+        self.cfg.GetNodeGroupInstances(self.group_uuid)
 
   def BuildHooksEnv(self):
     ret = {
@@ -16838,9 +16837,8 @@ class LUNetworkDisconnect(LogicalUnit):
       self.connected = False
       return
 
-    if self.op.conflicts_check:
-      _NetworkConflictCheck(self, lambda nic: nic.network == self.network_name,
-                            "disconnect from")
+    _NetworkConflictCheck(self, lambda nic: nic.network == self.network_name,
+                          "disconnect from")
 
   def Exec(self, feedback_fn):
     if not self.connected:
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 2c88363b1a997eb1e1ee857d23c320f4ef53a43f..e5333100361848214117dad00ab7dbb5220bbb28 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -2143,7 +2143,6 @@ class OpNetworkDisconnect(OpCode):
   OP_PARAMS = [
     _PGroupName,
     _PNetworkName,
-    ("conflicts_check", True, ht.TBool, "Whether to check for conflicting IPs"),
     ]
   OP_RESULT = ht.TNone