diff --git a/lib/Sema/SemaTemplateInstantiate.cpp b/lib/Sema/SemaTemplateInstantiate.cpp
index 4c3f100d74..9372d33788 100644
--- a/lib/Sema/SemaTemplateInstantiate.cpp
+++ b/lib/Sema/SemaTemplateInstantiate.cpp
@@ -1042,8 +1042,7 @@ Sema::InstantiateClassTemplateSpecialization(
       Expr *BitWidth = Field->getBitWidth();
       if (InvalidDecl)
         BitWidth = 0;
-      if (BitWidth && 
-          (BitWidth->isTypeDependent() || BitWidth->isValueDependent())) {
+      else if (BitWidth) {
         OwningExprResult InstantiatedBitWidth
           = InstantiateExpr(BitWidth, 
                             ClassTemplateSpec->getTemplateArgs(),