diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index e14330cf60e78774abd7c421b3b917216483260a..8c24b0333e1f4762bb219a7de599232c9b4e179b 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -2745,10 +2745,7 @@ static CompleteObject findCompleteObject(EvalInfo &Info, const Expr *E,
       } else if (VD->isConstexpr()) {
         // OK, we can read this variable.
       } else if (BaseType->isIntegralOrEnumerationType()) {
-        // In OpenCL if a variable is in constant address space it is a const value.
-        if (!(BaseType.isConstQualified() ||
-              (Info.getLangOpts().OpenCL &&
-               BaseType.getAddressSpace() == LangAS::opencl_constant))) {
+        if (!BaseType.isConstQualified()) {
           if (Info.getLangOpts().CPlusPlus) {
             Info.Diag(E, diag::note_constexpr_ltor_non_const_int, 1) << VD;
             Info.Note(VD->getLocation(), diag::note_declared_at);
diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index ddcdef843100e550ced993c7f66b4a106bdd876d..9786f7fb4f8ae0b7cc59cc1af38b17fea6e86a96 100644
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -2063,8 +2063,7 @@ static bool isArraySizeVLA(Sema &S, Expr *ArraySize, llvm::APSInt &SizeVal) {
   } Diagnoser;
 
   return S.VerifyIntegerConstantExpression(ArraySize, &SizeVal, Diagnoser,
-                                           S.LangOpts.GNUMode ||
-                                           S.LangOpts.OpenCL).isInvalid();
+                                           S.LangOpts.GNUMode).isInvalid();
 }
 
 /// \brief Build an array type.
diff --git a/test/CodeGenOpenCL/vla.cl b/test/CodeGenOpenCL/vla.cl
deleted file mode 100644
index 56533aba5dd06ea1183b7d431eedab493b154787..0000000000000000000000000000000000000000
--- a/test/CodeGenOpenCL/vla.cl
+++ /dev/null
@@ -1,18 +0,0 @@
-// RUN: %clang_cc1 -emit-llvm -O0 -cl-std=CL2.0 -o - %s | FileCheck %s
-
-constant int sz0 = 5;
-// CHECK: @sz0 = constant i32 5, align 4
-const global int sz1 = 16;
-// CHECK: @sz1 = constant i32 16, align 4
-const constant int sz2 = 8;
-// CHECK: @sz2 = constant i32 8, align 4
-// CHECK: @testvla.vla2 = internal global [8 x i16] undef, align 16
-
-kernel void testvla()
-{
-  int vla0[sz0];
-// CHECK: %vla0 = alloca [5 x i32], align 16
-  char vla1[sz1];
-// CHECK: %vla1 = alloca [16 x i8], align 16
-  local short vla2[sz2];
-}