@@ -2014,16 +2014,20 @@
 	(begin
 	  (debug:print 0 *default-log-port* "ERROR: common:wait-for-homehost-load called before *toppath* set.")
 	  (thread-sleep! 30)
 	  (if (< (- (current-seconds) start-time) 300)
 	      (loop start-time)))))
-  (let* ((hh-dat (if (common:on-homehost?) ;; if we are on the homehost then pass in #f so the calls are local.
-                     #f
-                     (server:choose-server *toppath* 'homehost)))
-         (hh     (if hh-dat (car hh-dat) #f)))
-    (common:wait-for-normalized-load maxnormload msg hh)))
-
+  (case (rmt:transport-mode)
+    ((http)
+     (let* ((hh-dat (if (common:on-homehost?) ;; if we are on the homehost then pass in #f so the calls are local.
+			#f
+			(server:choose-server *toppath* 'homehost)))
+            (hh     (if hh-dat (car hh-dat) #f)))
+       (common:wait-for-normalized-load maxnormload msg hh)))
+    (else
+     (common:wait-for-normalized-load maxnormload msg (get-host-name)))))
+    
 (define (common:get-num-cpus remote-host)
   (let* ((actual-host (or remote-host (get-host-name))))
     ;; hosts had better not be changing the number of cpus too often!
     (or (hash-table-ref/default *numcpus-cache* actual-host #f)
 	(let* ((numcpus (or (common:get-cached-info actual-host "num-cpus" age: (+ 2592000 (random 3600)))