diff --git a/lib/Target/X86/X86Subtarget.cpp b/lib/Target/X86/X86Subtarget.cpp
index d8ba88e9e99..a0d26b0fe18 100644
--- a/lib/Target/X86/X86Subtarget.cpp
+++ b/lib/Target/X86/X86Subtarget.cpp
@@ -139,12 +139,6 @@ X86Subtarget::X86Subtarget(const Module &M, const std::string &FS) {
   // Parse features string.
   ParseSubtargetFeatures(FS, CPU);
 
-  // FIXME: Just because the CPU supports 64-bit operation doesn't mean it isn't
-  // currently running a 32-bit operating system.  This must be taken into account.
-  // This hack will do for now, though obviously it breaks cross-compilation.
-  if (sizeof(void *) == 4)
-    Is64Bit = false;
-
   // Default to ELF unless otherwise specified.
   TargetType = isELF;