diff --git a/ChangeLog b/ChangeLog
index b53ef1417..0ca6b418a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-01  Mike Kestner  <mkestner@novell.com>
+
+	* gtk/Gtk.metadata: automarshal TreeView.Columns.
+	* gtk/TreeView.custom: kill Columns customization.
+	[Fixes #450685]
+
 2008-11-28  Mike Kestner  <mkestner@novell.com>
 
 	* generator/Signal.cs: remove ref int workaround now that we fallback
diff --git a/gtk/Gtk.metadata b/gtk/Gtk.metadata
index 061622b49..6b888d069 100644
--- a/gtk/Gtk.metadata
+++ b/gtk/Gtk.metadata
@@ -710,7 +710,8 @@
   <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='EnableModelDragDest']/*/*[@name='targets']" name="array">1</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='EnableModelDragSource']/*/*[@name='targets']" name="array">1</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='GetCellArea']/*/*[@name='rect']" name="pass_as">out</attr>
-  <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='GetColumns']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='GetColumns']/return-type" name="element_type">GtkTreeViewColumn*</attr>
+  <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='GetColumns']/return-type" name="owned">true</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='GetCursor']/*/*[@name='focus_column']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='GetCursor']/*/*[@name='path']" name="pass_as">out</attr>
   <attr path="/api/namespace/object[@cname='GtkTreeView']/method[@name='GetCursor']/*/*[@name='path']" name="owned">true</attr>
diff --git a/gtk/TreeView.custom b/gtk/TreeView.custom
index ef6d92688..70fbabb71 100644
--- a/gtk/TreeView.custom
+++ b/gtk/TreeView.custom
@@ -58,22 +58,6 @@
 			}
 		}
 
-		[DllImport("libgtk-win32-2.0-0.dll")]
-		static extern IntPtr gtk_tree_view_get_columns (IntPtr raw);
-
-		public TreeViewColumn[] Columns {
-			get {
-				IntPtr raw_ret = gtk_tree_view_get_columns (Handle);
-				if (raw_ret == IntPtr.Zero)
-					return new TreeViewColumn [0];
-				GLib.List list = new GLib.List (raw_ret);
-				TreeViewColumn[] result = new TreeViewColumn [list.Count];
-				for (int i = 0; i < list.Count; i++)
-					result [i] = list [i] as TreeViewColumn;
-				return result;
-			}
-		}
-
 		[DllImport("libgtk-win32-2.0-0.dll")]
 		static extern bool gtk_tree_view_get_path_at_pos (IntPtr raw,
 								  int x,