diff --git a/ChangeLog b/ChangeLog
index b3b06353ac..c49c0f8078 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-05  Ray Strode  <rstrode@redhat.com>
+
+	* src/nm-netlink-monitor.c:
+		- Use clear_event_source instead of g_nullify_pointer() again.
+
 2005-05-05  Dan Williams  <dcbw@redhat.com>
 
 	* gnome/applet/main.c
diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c
index 06d59bc152..868fe97b75 100644
--- a/src/nm-netlink-monitor.c
+++ b/src/nm-netlink-monitor.c
@@ -268,6 +268,13 @@ nm_netlink_monitor_new (void)
 	return NM_NETLINK_MONITOR (instance);
 }
 
+static void
+nm_netlink_monitor_clear_event_source (NmNetlinkMonitor *monitor)
+{
+	monitor->priv->event_source = NULL;
+}
+
+
 void
 nm_netlink_monitor_attach (NmNetlinkMonitor *monitor, 
 			   GMainContext     *context)
@@ -290,7 +297,7 @@ nm_netlink_monitor_attach (NmNetlinkMonitor *monitor,
 			       (GSourceFunc) nm_netlink_monitor_event_handler,
 			       monitor, 
 			       (GDestroyNotify) 
-			       g_nullify_pointer);
+                               nm_netlink_monitor_clear_event_source);
 	g_source_attach (event_source, context);
 	monitor->priv->event_source = event_source;
 }