@@ -35,11 +35,11 @@
 	 (itempath (db:test-get-item-path test)))
     (conc testname (if (equal? itempath "") "" (conc "(" itempath ")")))))
 
 ;; This is the *new* methodology. One record to inform them and in the chaos, organise them.
 ;;
-(define (runs:create-run-record)
+(define (runs:create-run-record #!key (remote #f))
   (let* ((mconfig      (if *configdat*
 		           *configdat*
 		           (if (launch:setup-for-run)
 		               *configdat*
 		               (begin
@@ -54,13 +54,10 @@
 	  (keys        (keys:config-get-fields mconfig))
 	  (keyvals     (keys:target->keyval keys target))
 	  (toppath     *toppath*)
 	  (envdat      keyvals) ;; initial values start with keyvals
 	  (runconfig   #f)
-	  (serverdat   (if (args:get-arg "-server")
-			   *runremote*
-			   #f)) ;; to be used later
 	  (transport   (or (args:get-arg "-transport") 'http))
 	  (run-id      #f))
     ;; Set all the environment vars we know so far, start with keys
     (for-each (lambda (keyval)
 		(setenv (car keyval)(cadr keyval)))
@@ -88,11 +85,11 @@
 		(for-each (lambda (varval)
 			    (set! envdat (append envdat (list varval)))
 			    (safe-setenv (car varval)(cadr varval)))
 			  (configf:get-section runconfig section)))
 	      (list "default" target))
-    (vector target runname testpatt keys keyvals envdat mconfig runconfig serverdat transport db toppath run-id)))
+    (vector target runname testpatt keys keyvals envdat mconfig runconfig (common:get-remote remote run-id) transport db toppath run-id)))
 
 (define (runs:set-megatest-env-vars run-id #!key (inkeys #f)(inrunname #f)(inkeyvals #f))
   (let* ((target    (or (common:args-get-target)
 			(get-environment-variable "MT_TARGET")))
 	 (keys    (if inkeys    inkeys    (rmt:get-keys)))