diff --git a/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp b/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp
index bcd0f78aba2..72e537a7dcd 100644
--- a/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp
+++ b/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp
@@ -83,8 +83,7 @@ static inline bool isZeroConst (Value *V) {
 bool llvm::DecomposeArrayRef(GetElementPtrInst* GEP) {
   if (GEP->getNumIndices() < 2
       || (GEP->getNumIndices() == 2
-          && isZeroConst(GEP->getOperand(1))
-          && isa<ConstantInt>(GEP->getOperand(2)))) {
+          && isZeroConst(GEP->getOperand(1)))) {
     DEBUG (std::cerr << "DecomposeArrayRef: Skipping " << *GEP);
     return false;
   } else {