diff --git a/pcbnew/router/pns_kicad_iface.cpp b/pcbnew/router/pns_kicad_iface.cpp
index 86ab35d0a7..2a20d9b206 100644
--- a/pcbnew/router/pns_kicad_iface.cpp
+++ b/pcbnew/router/pns_kicad_iface.cpp
@@ -82,7 +82,9 @@ public:
     virtual bool DpNetPair( const PNS::ITEM* aItem, int& aNetP, int& aNetN ) override;
     virtual bool IsDiffPair( const PNS::ITEM* aA, const PNS::ITEM* aB ) override;
 
-    virtual bool QueryConstraint( PNS::CONSTRAINT_TYPE aType, const PNS::ITEM* aItemA, const PNS::ITEM* aItemB, int aLayer, PNS::CONSTRAINT* aConstraint ) override;
+    virtual bool QueryConstraint( PNS::CONSTRAINT_TYPE aType, const PNS::ITEM* aItemA,
+                                  const PNS::ITEM* aItemB, int aLayer,
+                                  PNS::CONSTRAINT* aConstraint ) override;
     virtual wxString NetName( int aNet ) override;
 
 private:
@@ -282,18 +284,6 @@ int PNS_PCBNEW_RULE_RESOLVER::Clearance( const PNS::ITEM* aA, const PNS::ITEM* a
     PNS::CONSTRAINT constraint;
     int rv = 0;
 
-    if( aB && IsDiffPair( aA, aB ) )
-    {
-        // for diff pairs, we use the gap value for shoving/dragging
-        if( QueryConstraint( PNS::CONSTRAINT_TYPE::CT_DIFF_PAIR_GAP, aA, aB, aA->Layer(),
-                             &constraint ) )
-        {
-            rv = constraint.m_Value.Opt();
-            m_clearanceCache[ key ] = rv;
-            return rv;
-        }
-    }
-
     if( isCopper( aA ) && ( !aB || isCopper( aB ) ) )
     {
         if( QueryConstraint( PNS::CONSTRAINT_TYPE::CT_CLEARANCE, aA, aB, aA->Layer(),