diff --git a/ChangeLog b/ChangeLog
index d16e7c6fd9..9cb94c5ba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-11  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-device-wifi.c
+		- (can_scan): remove old madwifi hack for not scanning while connected
+
 2008-10-11  Dan Williams  <dcbw@redhat.com>
 
 	Add support for VPN subnet gateways (bgo #549196)
diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
index 664f679277..f0ed948ed9 100644
--- a/src/nm-device-wifi.c
+++ b/src/nm-device-wifi.c
@@ -1669,16 +1669,7 @@ can_scan (NMDeviceWifi *self)
 			return FALSE;
 	}
 
-	/* Devices supporting only B/G frequencies can scan when disconnected 
-	 * and activated, but not when activating.  We don't allow a/b/g devices to
-	 * scan when activated, because there are just too many channels to scan and
-	 * it takes too long to scan them, so users get angry when their SSH
-	 * sessions lag.
-	 */
-	if ((priv->num_freqs <= 14) && (dev_state == NM_DEVICE_STATE_ACTIVATED))
-		return TRUE;
-
-	return FALSE;
+	return TRUE;
 }
 
 static gboolean