diff --git a/tools/worldload.lisp b/tools/worldload.lisp
index 9f04018f9c45d08fd134b2b6c14b95f844254312..e3518296f54a408290e145157c7673d89eda7f64 100644
--- a/tools/worldload.lisp
+++ b/tools/worldload.lisp
@@ -72,12 +72,16 @@
 ;;;
 (load "code:run-program")
 
-#|
+
 ;;; CLX.
 ;;;
+#+clx(progn
 (load "clx:defsystem")
-(load-clx (pathname "clx:"))
+(setf (symbol-function 'xlib::clx-foreign-files) #'list); #### Hack...
+(xlib::load-clx (pathname "clx:"))
+)
 
+#|
 ;;; A hack to fix a bug in the X11 R3 server.  This should go away when
 ;;; the server is fixed.
 ;;;