diff --git a/src/main/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManager.java
index b94c30c..279e4c3 100644
--- a/src/main/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/onrc/onos/core/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -989,9 +989,13 @@
         NodePortTuple nptSrc = new NodePortTuple(lt.getSrc(), lt.getSrcPort());
         NodePortTuple nptDst = new NodePortTuple(lt.getDst(), lt.getDstPort());
         removeFromQuarantineQueue(nptSrc);
-        removeFromMaintenanceQueue(nptSrc);
         removeFromQuarantineQueue(nptDst);
-        removeFromMaintenanceQueue(nptDst);
+
+        // XXX ONOS: Don't remove the port from the maintenance queue here
+        // because it sometimes prevents BDDPs from being sent and causes
+        // links to flap
+        // removeFromMaintenanceQueue(nptSrc);
+        // removeFromMaintenanceQueue(nptDst);
 
         // Consume this message
         return Command.STOP;