diff --git a/ice-9/boot-9.scm b/ice-9/boot-9.scm
index 9b92a5a60..9913e8e27 100644
--- a/ice-9/boot-9.scm
+++ b/ice-9/boot-9.scm
@@ -2979,7 +2979,14 @@
       (load-emacs-interface))
 
   ;; Place the user in the guile-user module.
-  (define-module (guile-user))
+  (define-module (guile-user)
+    :use-module (ice-9 session)
+    :use-module (ice-9 debug)
+    :use-module (ice-9 debugger))
+  (if (memq 'threads *features*)
+      (define-module (guile-user) :use-module (ice-9 threads)))
+  (if (memq 'regex *features*)
+      (define-module (guile-user) :use-module (ice-9 regex)))
 
   (let ((old-handlers #f)
 	(signals `((,SIGINT . "User interrupt")
@@ -3052,49 +3059,6 @@
 ;;;
 (define exit-hook (make-hook))
 
-;;; Load readline code into root module if readline primitives are available.
-;;;
-;;; Ideally, we wouldn't do this until we were sure we were actually
-;;; going to enter the repl, but autoloading individual functions is
-;;; clumsy at the moment.
-(if (and (memq 'readline *features*)
-	 (isatty? (current-input-port)))
-    (begin
-      (define-module (guile) :use-module (ice-9 readline))
-      (define-module (guile-user) :use-module (ice-9 readline))))
-
-
-;;; {Load debug extension code into user module if debug extensions present.}
-;;;
-;;; *fixme* This is a temporary solution.
-;;;
-
-(if (memq 'debug-extensions *features*)
-    (define-module (guile-user) :use-module (ice-9 debug)))
-
-
-;;; {Load session support into user module if present.}
-;;;
-;;; *fixme* This is a temporary solution.
-;;;
-
-(if (%search-load-path "ice-9/session.scm")
-    (define-module (guile-user) :use-module (ice-9 session)))
-
-;;; {Load thread code into user module if threads are present.}
-;;;
-;;; *fixme* This is a temporary solution.
-;;;
-
-(if (memq 'threads *features*)
-    (define-module (guile-user) :use-module (ice-9 threads)))
-
-
-;;; {Load regexp code if regexp primitives are available.}
-
-(if (memq 'regex *features*)
-    (define-module (guile-user) :use-module (ice-9 regex)))
-
 
 (define-module (guile))