diff --git a/ChangeLog b/ChangeLog
index 7a72b9ce83..96b939f16a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-26  Dan Williams <dcbw@redhat.com>
+
+	* src/NetworkManagerDevice.c
+		- (nm_device_wireless_scan): Remove duplicated scanning code
+
 2005-03-25  Dan Williams <dcbw@redhat.com>
 
 	* panel-applet/NMWirelessApplet.c
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index 89fe221101..a216741c0b 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -3735,23 +3735,6 @@ static gboolean nm_device_wireless_scan (gpointer user_data)
 				nm_completion_scan_has_results, NULL,
 				dev, &err, sk, scan_results);
 
-
-			err = iw_scan (sk, (char *)nm_device_get_iface (dev), WIRELESS_EXT, &(scan_results->scan_head));
-			if ((err == -1) && (errno == ENODATA))
-			{
-				/* Card hasn't had time yet to compile full access point list.
-				 * Give it some more time and scan again.  If that doesn't work
-				 * give up.
-				 */
-				g_usleep ((G_USEC_PER_SEC * nm_device_get_association_pause_value (dev)) / 2);
-				err = iw_scan (sk, (char *)nm_device_get_iface (dev), WIRELESS_EXT, &(scan_results->scan_head));
-				if (err == -1)
-					scan_results->scan_head.result = NULL;
-			}
-			else if ((err == -1) && (errno == ETIME))
-				nm_warning ("The wireless card (%s) requires too much time for scans. "
-					    "Its driver needs to be fixed.", nm_device_get_iface (dev));
-
 			nm_device_set_mode (dev, orig_mode);
 			/* Only set frequency if ad-hoc mode */
 			if (orig_mode == NETWORK_MODE_ADHOC)