Experimental change to try to prevent orphaned nodes in the routing table.