diff --git a/lib/CodeGen/CGClass.cpp b/lib/CodeGen/CGClass.cpp
index a21af41..2b06e5e 100644
--- a/lib/CodeGen/CGClass.cpp
+++ b/lib/CodeGen/CGClass.cpp
@@ -160,7 +160,10 @@
     return 0;
   }
 
+#if 0
+  // FIXME: Re-enable this assert when the underlying bugs have been fixed.
   assert(!Paths.isAmbiguous(BTy) && "Path is ambiguous");
+#endif
 
   unsigned Start = 0;