diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
index b052414b256197d9a6d601da19f87a1cac2a9f34..5179e3bcb11d04157672ddf8cd329c40f6e380b3 100644
--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
+++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
@@ -397,11 +397,13 @@ void X86MCCodeEmitter::EmitMemModRMByte(const MCInst &MI, unsigned Op,
   unsigned int KsError;
   bool RIP_rel = false;
 
+  /*
   // do we need x64 RIP relative encoding?
   if (BaseReg == 0 && is64BitMode(STI) && IndexReg.getReg() == 0 && Disp.isImm()) {
       if (ABS_SUB(MI.getAddress(), (uint64_t)Disp.getImm()) < 2 * (1UL << 30))
           RIP_rel = true;
   }
+  */
 
   // Handle %rip relative addressing.
   if (RIP_rel || BaseReg == X86::RIP) {    // [disp32+RIP] in X86-64 mode