diff --git a/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp b/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp
index b671d68031a..02d2bacabec 100644
--- a/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp
+++ b/lib/Transforms/Scalar/CorrelatedValuePropagation.cpp
@@ -86,8 +86,6 @@ STATISTIC(NumOverflows, "Number of overflow checks removed");
 STATISTIC(NumSaturating,
     "Number of saturating arithmetics converted to normal arithmetics");
 
-static cl::opt<bool> DontAddNoWrapFlags("cvp-dont-add-nowrap-flags", cl::init(false));
-
 namespace {
 
   class CorrelatedValuePropagation : public FunctionPass {
@@ -843,9 +841,6 @@ static bool processSExt(SExtInst *SDI, LazyValueInfo *LVI) {
 static bool processBinOp(BinaryOperator *BinOp, LazyValueInfo *LVI) {
   using OBO = OverflowingBinaryOperator;
 
-  if (DontAddNoWrapFlags)
-    return false;
-
   if (BinOp->getType()->isVectorTy())
     return false;
 
diff --git a/test/Transforms/CorrelatedValuePropagation/add.ll b/test/Transforms/CorrelatedValuePropagation/add.ll
index 026af75220d..e58a7e2ddf8 100644
--- a/test/Transforms/CorrelatedValuePropagation/add.ll
+++ b/test/Transforms/CorrelatedValuePropagation/add.ll
@@ -1,4 +1,4 @@
-; RUN: opt < %s -correlated-propagation -cvp-dont-add-nowrap-flags=false -S | FileCheck %s
+; RUN: opt < %s -correlated-propagation -S | FileCheck %s
 
 ; CHECK-LABEL: @test0(
 define void @test0(i32 %a) {
diff --git a/test/Transforms/CorrelatedValuePropagation/mul.ll b/test/Transforms/CorrelatedValuePropagation/mul.ll
index 288d114cb37..b3b579be765 100644
--- a/test/Transforms/CorrelatedValuePropagation/mul.ll
+++ b/test/Transforms/CorrelatedValuePropagation/mul.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -cvp-dont-add-nowrap-flags=false -S | FileCheck %s
+; RUN: opt < %s -correlated-propagation -S | FileCheck %s
 
 define i8 @test0(i8 %a) {
 ; CHECK-LABEL: @test0(
diff --git a/test/Transforms/CorrelatedValuePropagation/shl.ll b/test/Transforms/CorrelatedValuePropagation/shl.ll
index 0514ec95bdb..17e65cde1f4 100644
--- a/test/Transforms/CorrelatedValuePropagation/shl.ll
+++ b/test/Transforms/CorrelatedValuePropagation/shl.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -cvp-dont-add-nowrap-flags=false -S | FileCheck %s
+; RUN: opt < %s -correlated-propagation -S | FileCheck %s
 
 define i8 @test0(i8 %a, i8 %b) {
 ; CHECK-LABEL: @test0(
diff --git a/test/Transforms/CorrelatedValuePropagation/sub.ll b/test/Transforms/CorrelatedValuePropagation/sub.ll
index 091059c0b2d..696665f6e3c 100644
--- a/test/Transforms/CorrelatedValuePropagation/sub.ll
+++ b/test/Transforms/CorrelatedValuePropagation/sub.ll
@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -correlated-propagation -cvp-dont-add-nowrap-flags=false -S | FileCheck %s
+; RUN: opt < %s -correlated-propagation -S | FileCheck %s
 
 define void @test0(i32 %a) {
 ; CHECK-LABEL: @test0(