@@ -364,17 +364,13 @@
 	      (if (or (args-defined? "-h" "-version" "-gen-megatest-area" "-gen-megatest-test")
 		      (eq? (length (hash-table-keys args:arg-hash)) 0))
 		  (debug:print-info 1 "Server connection not needed")
 		  (begin
 		    (if run-id 
-			(begin
-			  (server:ensure-running run-id)
-			  (client:launch run-id))
-			(begin
-			  ;; without run-id we'll start a server for "0"
-			  (server:ensure-running 0)
-			  (client:launch 0)))))))))
+			(client:launch run-id) 
+			(client:launch 0)      ;; without run-id we'll start a server for "0"
+			)))))))
 
 ;; MAY STILL NEED THIS
 ;;		       (set! *megatest-db* (make-dbr:dbstruct path: *toppath* local: #t))))))))))
 
 (if (or (args:get-arg "-list-servers")