diff --git a/code/debug-int.lisp b/code/debug-int.lisp
index ff5d6ffc231da7adb3ff9a6b08e398db6cb728d1..d88f4c7dbd573a89c9c51922bafa2b11d5968a32 100644
--- a/code/debug-int.lisp
+++ b/code/debug-int.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.87 1998/01/25 06:02:05 dtc Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.88 1998/02/14 21:09:48 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -3137,10 +3137,6 @@
       (#.vm:unsigned-reg-sc-number
        (with-escaped-value (val)
 	 val))
-      (#.vm:non-descriptor-reg-sc-number
-       (error "Local non-descriptor register access?"))
-      (#.vm:interior-reg-sc-number
-       (error "Local interior register access?"))
       (#.vm:single-reg-sc-number
        (escaped-float-value single-float))
       (#.vm:double-reg-sc-number
@@ -3388,10 +3384,6 @@
        (set-escaped-value (logand value (1- (ash 1 vm:word-bits)))))
       (#.vm:unsigned-reg-sc-number
        (set-escaped-value value))
-      (#.vm:non-descriptor-reg-sc-number
-       (error "Local non-descriptor register access?"))
-      (#.vm:interior-reg-sc-number
-       (error "Local interior register access?"))
       (#.vm:single-reg-sc-number
 	#+nil ;; don't have escaped floats.
        (set-escaped-float-value single-float value))
diff --git a/compiler/x86/vm.lisp b/compiler/x86/vm.lisp
index 97ae6b6f9e46425923344bcd33e2ee867ab4348f..b9f2f9b35c2b0542ad0866f656f8e32de1175c56 100644
--- a/compiler/x86/vm.lisp
+++ b/compiler/x86/vm.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
- "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/vm.lisp,v 1.6 1997/11/18 10:53:27 dtc Exp $")
+ "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/x86/vm.lisp,v 1.7 1998/02/14 21:09:52 dtc Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -16,7 +16,7 @@
 ;;; Written by William Lott
 ;;;
 ;;; Debugged by Paul F. Werkowski Spring/Summer 1995.
-;;; Enhancements/debugging by Douglas T. Crosher 1996, 1997.
+;;; Enhancements/debugging by Douglas T. Crosher 1996, 1997, 1998.
 ;;;
 
 (in-package :x86)
@@ -307,18 +307,6 @@
 
   ;; A catch or unwind block.
   (catch-block stack :element-size vm:catch-block-size)
-  
-  ;; added by jrd.  need to define non-descriptor-reg-sc-number for the
-  ;; debug code, among others.  this doesn't actually get used in any code.
-  (non-descriptor-reg registers
-		      :locations #.dword-regs
-		      :element-size 2
-		      :reserve-locations ())
-  ;; this one too
-  (interior-reg registers
-		      :locations #.dword-regs
-		      :element-size 2
-		      :reserve-locations ())
   )
 
 (eval-when (compile load eval)