diff --git a/lib/CodeGen/SelectionDAG/FastISel.cpp b/lib/CodeGen/SelectionDAG/FastISel.cpp
index 71042ff277a..450596e50d0 100644
--- a/lib/CodeGen/SelectionDAG/FastISel.cpp
+++ b/lib/CodeGen/SelectionDAG/FastISel.cpp
@@ -124,10 +124,8 @@ bool FastISel::SelectGetElementPtr(Instruction *I,
         // Unhandled operand. Halt "fast" selection and bail.
         return false;
 
-      // FIXME: If multiple is power of two, turn it into a shift. The
-      // optimization should be in FastEmit_ri?
-      IdxN = FastEmit_ri_(VT, ISD::MUL, IdxN,
-                          ElementSize, VT);
+      if (ElementSize != 1)
+        IdxN = FastEmit_ri_(VT, ISD::MUL, IdxN, ElementSize, VT);
       if (IdxN == 0)
         // Unhandled operand. Halt "fast" selection and bail.
         return false;