diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index 0b2ef855fd6..be0102c846a 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -762,15 +762,12 @@ void SelectionDAG::VerifyNode(SDNode *N) {
     assert(N->getValueType(0).isVector() && "Wrong return type!");
     assert(N->getNumOperands() == N->getValueType(0).getVectorNumElements() &&
            "Wrong number of operands!");
-    // FIXME: Change vector_shuffle to a variadic node with mask elements being
-    // operands of the node.  Currently the mask is a BUILD_VECTOR passed as an
-    // operand, and it is not always possible to legalize it.  Turning off the
-    // following checks at least makes it possible to legalize most of the time.
-//    MVT EltVT = N->getValueType(0).getVectorElementType();
-//    for (SDNode::op_iterator I = N->op_begin(), E = N->op_end(); I != E; ++I)
-//      assert((I->getValueType() == EltVT ||
-//              I->getValueType() == TLI.getTypeToTransformTo(EltVT)) &&
-//             "Wrong operand type!");
+    MVT EltVT = N->getValueType(0).getVectorElementType();
+    for (SDNode::op_iterator I = N->op_begin(), E = N->op_end(); I != E; ++I)
+      assert((I->getValueType() == EltVT ||
+              (EltVT.isInteger() && I->getValueType().isInteger() &&
+               EltVT.bitsLE(I->getValueType()))) &&
+             "Wrong operand type!");
     break;
   }
   }