diff --git a/lib/Target/X86/X86ISelLowering.cpp b/lib/Target/X86/X86ISelLowering.cpp
index c5124f87265..6dae08d9f99 100644
--- a/lib/Target/X86/X86ISelLowering.cpp
+++ b/lib/Target/X86/X86ISelLowering.cpp
@@ -121,7 +121,11 @@ X86TargetLowering::X86TargetLowering(X86TargetMachine &TM)
       setOperationAction(ISD::UINT_TO_FP   , MVT::i64  , Custom);
 
       // We have faster algorithm for ui32->single only.
+#if 0
       setOperationAction(ISD::UINT_TO_FP   , MVT::i32  , Custom);
+#else
+      setOperationAction(ISD::UINT_TO_FP   , MVT::i32  , Expand);
+#endif
     } else
       setOperationAction(ISD::UINT_TO_FP   , MVT::i32  , Promote);
   }