diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/StackFrame.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/StackFrame.java
index caffc6f2c37..9011f9a961d 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/StackFrame.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/StackFrame.java
@@ -136,19 +136,9 @@ public class StackFrame extends CObject implements ICDIStackFrame {
 	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getRegisters(ICDIRegisterObject[])
 	 */
 	public ICDIRegister[] getRegisters(ICDIRegisterObject[] regs) throws CDIException {
-		ICDIRegister[] registers = null;
-		CSession session = getCTarget().getCSession();
-		VariableManager mgr = (VariableManager)session.getVariableManager();
-		MISession mi = session.getMISession();
-		CommandFactory factory = mi.getCommandFactory();
-		registers = new ICDIRegister[regs.length];
-		for (int i = 0; i < registers.length; i++) {
-			registers[i] = mgr.createRegister(this, regs[i].getName());
-		}
-		if (registers == null) {
-			registers = new ICDIRegister[0];
-		}
-		return registers;
+		/* FIXME:  Remove this call and use CTarget.getRegiters() */
+		RegisterManager mgr = getCTarget().getCSession().getRegisterManager();
+		return mgr.createRegisters(regs);
 	}
 
 	/**