diff --git a/lib/Transforms/ObjCARC/ObjCARCOpts.cpp b/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
index 5646e5285a2..ba6c04e514c 100644
--- a/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
+++ b/lib/Transforms/ObjCARC/ObjCARCOpts.cpp
@@ -713,9 +713,9 @@ EnableARCAnnotations("enable-objc-arc-annotations", cl::init(false),
                      cl::desc("Enable emission of arc data flow analysis "
                               "annotations"));
 static cl::opt<bool>
-EnableCheckForCFGHazards("enable-objc-arc-checkforcfghazards", cl::init(true),
-                         cl::desc("Disable check for cfg hazards when "
-                                  "annotating"));
+DisableCheckForCFGHazards("disable-objc-arc-checkforcfghazards", cl::init(false),
+                          cl::desc("Disable check for cfg hazards when "
+                                   "annotating"));
 
 /// This function appends a unique ARCAnnotationProvenanceSourceMDKind id to an
 /// instruction so that we can track backwards when post processing via the llvm
@@ -2177,7 +2177,7 @@ ObjCARCOpt::VisitTopDown(BasicBlock *BB,
   ANNOTATE_TOPDOWN_BBEND(MyStates, BB);
 
 #ifdef ARC_ANNOTATIONS
-  if (EnableARCAnnotations && EnableCheckForCFGHazards)
+  if (!(EnableARCAnnotations && DisableCheckForCFGHazards))
 #endif
   CheckForCFGHazards(BB, BBStates, MyStates);
   return NestingDetected;