diff --git a/tools/worldload.lisp b/tools/worldload.lisp
index 1432f988e2e41cd59d49ca281e2229d219b11aee..1ceeac07e43e17d3e0d88b49aa507cc0a7bc73f7 100644
--- a/tools/worldload.lisp
+++ b/tools/worldload.lisp
@@ -68,6 +68,10 @@
 (load "code:pprint")
 (load "code:run-program")
 (load "code:query")
+(load "code:loop")
+(load "code:internet")
+(load "code:wire")
+(load "code:remote")
 
 ;;; Load the compiler.
 (load "c:loadcom.lisp")
@@ -88,19 +92,6 @@
 #-no-clx
 (load "code:clx-ext")
 
-#|
-;;; A hack to fix a bug in the X11 R3 server.  This should go away when
-;;; the server is fixed.
-;;;
-(load "/afs/cs/project/clisp/systems-work/font-patch")
-|#
-
-;;; Stick these before Hemlock.
-;;;
-(load "code:internet")
-(load "code:wire")
-(load "code:remote")
-
 ;;; Hemlock.
 ;;;
 #-no-hemlock