diff --git a/tools/setup.lisp b/tools/setup.lisp
index 54d38cfad37266ac93f835c8716d58362636ab92..5c7adeb9f252223e32da690a8d52ef3183ca8ab8 100644
--- a/tools/setup.lisp
+++ b/tools/setup.lisp
@@ -3,7 +3,7 @@
 ;;; **********************************************************************
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/setup.lisp,v 1.36 2003/06/18 09:23:08 gerd Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/setup.lisp,v 1.37 2003/06/18 11:07:40 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -11,6 +11,9 @@
 ;;; compilation utilities.
 ;;;
 
+(when (boundp 'conditions::*make-condition-accessor-methods*)
+  (setq conditions::*make-condition-accessor-methods* nil))
+
 ;;; Ensure pre-ANSI defstruct processing occurs during system builds.
 (in-package "KERNEL")
 (defparameter *ansi-defstruct-options-p* nil)
diff --git a/tools/worldcom.lisp b/tools/worldcom.lisp
index 786006a28731e8720c8b0023b94decca050f50eb..437361f449f7fa76f41f0165cb91d19288bd107c 100644
--- a/tools/worldcom.lisp
+++ b/tools/worldcom.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldcom.lisp,v 1.88 2003/06/18 09:23:08 gerd Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/tools/worldcom.lisp,v 1.89 2003/06/18 11:07:40 gerd Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -19,9 +19,6 @@
 (defvar *byte-compile* #+small t #-small :maybe)
 (defvar *original-%deftype* #'lisp::%deftype)
 
-(when (boundp 'conditions::*make-condition-accessor-methods*)
-  (setq conditions::*make-condition-accessor-methods* nil))
-
 (with-compiler-log-file
     ("target:compile-lisp.log"
      :optimize '(optimize (speed 2) (space 2) (inhibit-warnings 2)