@@ -523,33 +523,15 @@
    (exn ()
         (debug:print-error 0 *default-log-port* "Could not open log file for write: "logpath)
         (define *didsomething* #t)  
         (exit 1))))
 
-;; this is a good place to populate the *functions* hash with
-;; functions needed during the transition to modules
-;;
-;; NOTE: the definition in dbmod seems to "win" - make it available everywhere
-;;
-(set! *functions* dbmod#*functions*)
-(set! apimod#*functions* dbmod#*functions*)
-(set! configfmod#*functions* dbmod#*functions*)
-
-(set-fn 'client:setup client:setup)
-(set-fn 'db:setup       db:setup)
-(set-fn 'server:expiration-timeout server:expiration-timeout)
-(set-fn 'common:get-homehost       common:get-homehost)
-(set-fn 'server:check-if-running   server:check-if-running)
-(set-fn 'api:execute-requests      api:execute-requests)
-(set-fn 'http-transport:close-connections  http-transport:close-connections )
-(set-fn 'http-transport:client-api-send-receive http-transport:client-api-send-receive)
-(set-fn 'server:kind-run  server:kind-run)
-(set-fn 'server:start-and-wait server:start-and-wait)
-(set-fn 'server:check-if-running server:check-if-running)
-(set-fn 'server:ping server:ping )
-(set-fn 'common:force-server? common:force-server? )
-
+;; (set! *functions* dbmod#*functions*)
+;; (set! apimod#*functions* dbmod#*functions*)
+;; (set! configfmod#*functions* dbmod#*functions*)
+
+(include "migrate-fix.scm")
 
 ;; this segment will run launch:setup only if -log is not set. This is fairly safe as servers are not
 ;; manually started and thus should never be started in a non-megatest area. Thus no need to handle situation
 ;; where (launch:setup) returns #f?
 ;;