diff --git a/ChangeLog b/ChangeLog
index d0a915fe6..cfce34ed8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-08  Joe Shaw  <joe@assbarn.com>
+
+	* generator/ObjectGen.cs (GenProperty): Comment the last checkin out
+	because it exposes a compiler bug.
+	(GenSignal): Back this change out.
+
 2002-05-08  Joe Shaw  <joe@assbarn.com>
 
 	* */Makefile.in: Don't allow the shell to do file globbing; makes
diff --git a/generator/ObjectGen.cs b/generator/ObjectGen.cs
index b3acfc973..00c87ac03 100644
--- a/generator/ObjectGen.cs
+++ b/generator/ObjectGen.cs
@@ -184,8 +184,11 @@ namespace GtkSharp.Generation {
 				Console.Write("Interface property detected ");
 				Statistics.ThrottledCount++;
 				return true;
-			} else if (table.IsObject(c_type)) {
-				v_type = "GLib.Object";
+			// FIXME: This will cause InvalidCastExceptions but
+			// it's commented out to help expose a compiler bug
+			//
+			// } else if (table.IsObject(c_type)) {
+			// 	v_type = "GLib.Object";
 			}
 			
 			if (cs_type == "") {
@@ -231,7 +234,7 @@ namespace GtkSharp.Generation {
 		public bool GenSignal (XmlElement sig, SymbolTable table, StreamWriter sw, out String name)
 		{
 			String cname = "\"" + sig.GetAttribute("cname") + "\"";
-			name = sig.GetAttribute("name") + "EventHandler";
+			name = sig.GetAttribute("name");
 
 			String marsh = SignalHandler.GetName(sig, table);
 			if (marsh == "") {