diff --git a/ChangeLog b/ChangeLog
index 13de8619ff..48f4d91cc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-02  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_leave_notify)P: revert fix of
+	#164884 because it's not a problem in gtk+ but in applications and
+	it breaks starting drags from the edge of a row.
+
 2006-06-02  Kristian Rietveld  <kris@imendio.com>
 
 	Separate sensitive/selectable properties.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 13de8619ff..48f4d91cc4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-06-02  Kristian Rietveld  <kris@imendio.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_leave_notify)P: revert fix of
+	#164884 because it's not a problem in gtk+ but in applications and
+	it breaks starting drags from the edge of a row.
+
 2006-06-02  Kristian Rietveld  <kris@imendio.com>
 
 	Separate sensitive/selectable properties.
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index d393a566dd..17533895e8 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -4724,12 +4724,11 @@ gtk_tree_view_leave_notify (GtkWidget        *widget,
 {
   GtkTreeView *tree_view;
 
-  tree_view = GTK_TREE_VIEW (widget);
-  tree_view->priv->pressed_button = -1;
-
   if (event->mode == GDK_CROSSING_GRAB)
     return TRUE;
 
+  tree_view = GTK_TREE_VIEW (widget);
+
   if (tree_view->priv->prelight_node)
     _gtk_tree_view_queue_draw_node (tree_view,
                                    tree_view->priv->prelight_tree,