Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -1739,20 +1739,10 @@
 	    (debug:print 0 *default-log-port* "failed to write file " fullpath ", exn=" exn)
 	    #f)
 	  (with-output-to-file fullpath (lambda ()(pp dat)))))
       #f))
 
-(define (common:raw-get-remote-host-load-orig remote-host)
-  (handle-exceptions
-      exn
-    (begin
-      (debug:print 0 *default-log-port* "failed to ssh to " remote-host " and get loadavg. exn=" exn)
-      #f) ;; more specific handling of errors needed
-    (with-input-from-pipe 
-     (conc "ssh " remote-host " cat /proc/loadavg")
-     (lambda ()(list (read)(read)(read))))))
-
 (define (common:raw-get-remote-host-load remote-host)
   (let* ((inp #f))
     (handle-exceptions
 	exn
       (begin
@@ -1773,11 +1763,12 @@
     (begin
       (debug:print 0 *default-log-port* "failed to ssh or read loadavg from host " remote-host ", exn=" exn)
       '(-99 -99 -99))
     (let* ((actual-hostname (or remote-host (get-host-name) "localhost")))
       (or (common:get-cached-info actual-hostname "cpu-load")
-	  (let ((result (if remote-host
+	  (let ((result (if (and remote-host
+				 (not (equal? remote-host (get-host-name))))
 			    (map (lambda (res)
 				   (if (eof-object? res) 9e99 res))
 			         (common:raw-get-remote-host-load remote-host))
 			    (with-input-from-file "/proc/loadavg" 
 			      (lambda ()(list (read)(read)(read)))))))
@@ -2036,11 +2027,12 @@
 						       #f) ;; if zero return #f so caller knows that things are not working
 						   (loop (if (string-match "^processor\\s+:\\s+\\d+$" inl)
 							     (+ numcpu 1)
 							     numcpu)
 							 (read-line))))))
-				   (result (if remote-host
+				   (result (if (and remote-host
+						    (not (equal? remote-host (get-host-name))))
 					       (common:generic-ssh
 						(conc "ssh " remote-host " cat /proc/cpuinfo")
 						proc -1)
 					       (with-input-from-file "/proc/cpuinfo" proc))))
 			      (if (and (number? result)