diff --git a/generator/InterfaceGen.cs b/generator/InterfaceGen.cs
index cb6d1acb1..8f979f7b2 100644
--- a/generator/InterfaceGen.cs
+++ b/generator/InterfaceGen.cs
@@ -114,8 +114,6 @@ namespace GtkSharp.Generation {
 					sw.WriteLine ("\t\t\tnative_iface." + vm.Name + " = iface." + vm.Name + ";");
 				}
 				sw.WriteLine ("\t\t\tMarshal.StructureToPtr (native_iface, ifaceptr, false);");
-				sw.WriteLine ("\t\t\tGCHandle gch = (GCHandle) data;");
-				sw.WriteLine ("\t\t\tgch.Free ();");
 			}
 
 			foreach (Property prop in Properties.Values) {
diff --git a/glib/GInterfaceAdapter.cs b/glib/GInterfaceAdapter.cs
index 7b3c60064..ab71f6829 100644
--- a/glib/GInterfaceAdapter.cs
+++ b/glib/GInterfaceAdapter.cs
@@ -55,12 +55,7 @@ namespace GLib {
 		public abstract IntPtr Handle { get; }
 
 		internal GInterfaceInfo Info {
-			get {
-				if (info.Data == IntPtr.Zero)
-					info.Data = (IntPtr) GCHandle.Alloc (this);
-
-				return info;
-			}
+			get { return info; }
 		}
 	}
 }