diff --git a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
index 9acec26f622..770dfba47e7 100644
--- a/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
@@ -48,7 +48,7 @@ STATISTIC(EmittedInsts, "Number of machine instrs printed");
 //===----------------------------------------------------------------------===//
 
 void X86ATTAsmPrinter::printMCInst(const MCInst *MI) {
-  X86ATTInstPrinter(O, MAI, TRI).printInstruction(MI);
+  X86ATTInstPrinter(O, MAI).printInstruction(MI);
 }
 
 void X86ATTAsmPrinter::PrintPICBaseSymbol() const {
diff --git a/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp b/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp
index d989f60a595..a25fb2e0e31 100644
--- a/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp
@@ -19,7 +19,6 @@
 #include "llvm/MC/MCExpr.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/FormattedStream.h"
-#include "llvm/Target/TargetRegisterInfo.h"  // FIXME: REMOVE.
 using namespace llvm;
 
 // Include the auto-generated portion of the assembly writer.
@@ -70,7 +69,7 @@ void X86ATTInstPrinter::printOperand(const MCInst *MI, unsigned OpNo,
   
   const MCOperand &Op = MI->getOperand(OpNo);
   if (Op.isReg()) {
-    O << '%' << TRI->getAsmName(Op.getReg());
+    O << '%' << getRegisterName(Op.getReg());
     return;
   } else if (Op.isImm()) {
     O << '$' << Op.getImm();
diff --git a/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h b/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h
index 4460e4b492e..773ac983611 100644
--- a/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h
+++ b/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h
@@ -24,10 +24,8 @@ namespace llvm {
 class X86ATTInstPrinter {
   raw_ostream &O;
   const MCAsmInfo *MAI;
-  const TargetRegisterInfo *TRI;  // FIXME: Elim.
 public:
-  X86ATTInstPrinter(raw_ostream &o, const MCAsmInfo *mai,
-                    const TargetRegisterInfo *tri) : O(o), MAI(mai), TRI(tri) {}
+  X86ATTInstPrinter(raw_ostream &o, const MCAsmInfo *mai) : O(o), MAI(mai) {}
 
   // Autogenerated by tblgen.
   void printInstruction(const MCInst *MI);
diff --git a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
index 484b5e91cdb..2585605f0e7 100644
--- a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
+++ b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
@@ -214,6 +214,11 @@ static void PrintRegName(raw_ostream &O, StringRef RegName) {
     O << (char)toupper(RegName[i]);
 }
 
+void X86IntelAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo,
+                                      const char *Modifier) {
+  printOp(MI->getOperand(OpNo), Modifier);
+}
+
 void X86IntelAsmPrinter::printOp(const MachineOperand &MO,
                                  const char *Modifier) {
   switch (MO.getType()) {
@@ -226,7 +231,7 @@ void X86IntelAsmPrinter::printOp(const MachineOperand &MO,
                     ((strcmp(Modifier,"subreg16") == 0) ? MVT::i16 :MVT::i8));
       Reg = getX86SubSuperRegister(Reg, VT);
     }
-    PrintRegName(O, TRI->getAsmName(Reg));
+    PrintRegName(O, getRegisterName(Reg));
     return;
   }
   case MachineOperand::MO_Immediate:
@@ -399,7 +404,7 @@ bool X86IntelAsmPrinter::printAsmMRegister(const MachineOperand &MO,
     break;
   }
 
-  PrintRegName(O, TRI->getAsmName(Reg));
+  PrintRegName(O, getRegisterName(Reg));
   return false;
 }
 
diff --git a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
index 222d2294c34..97acf5d0572 100644
--- a/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
+++ b/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
@@ -43,16 +43,7 @@ struct VISIBILITY_HIDDEN X86IntelAsmPrinter : public AsmPrinter {
 
   // This method is used by the tablegen'erated instruction printer.
   void printOperand(const MachineInstr *MI, unsigned OpNo,
-                    const char *Modifier = 0) {
-    const MachineOperand &MO = MI->getOperand(OpNo);
-    if (MO.isReg()) {
-      assert(TargetRegisterInfo::isPhysicalRegister(MO.getReg()) &&
-             "Not physreg??");
-      O << TM.getRegisterInfo()->get(MO.getReg()).Name;  // Capitalized names
-    } else {
-      printOp(MO, Modifier);
-    }
-  }
+                    const char *Modifier = 0);
   
   void print_pcrel_imm(const MachineInstr *MI, unsigned OpNo);