diff --git a/lib/MC/MCDwarf.cpp b/lib/MC/MCDwarf.cpp
index c274b9df63a..0225afa80e4 100644
--- a/lib/MC/MCDwarf.cpp
+++ b/lib/MC/MCDwarf.cpp
@@ -1011,7 +1011,8 @@ void MCDwarfFrameEmitter::Emit(MCStreamer &Streamer,
   // Emit the compact unwind info if available.
   // FIXME: This emits both the compact unwind and the old CIE/FDE
   //        information. Only one of those is needed.
-  if (IsEH && MOFI->getCompactUnwindSection())
+  // FIXME: Disable. This is causing failures in the test suite.
+  if (false && IsEH && MOFI->getCompactUnwindSection())
     for (unsigned i = 0, n = Streamer.getNumFrameInfos(); i < n; ++i) {
       const MCDwarfFrameInfo &Frame = Streamer.getFrameInfo(i);
       if (Frame.CompactUnwindEncoding)