@@ -118,11 +118,11 @@
 (include "db.scm")
 (include "configf.scm")
 (include "process.scm")
 (include "launch.scm")
 (include "runs.scm")
-;; (include "gui.scm")
+(include "runconfig.scm")
 
 (define *didsomething* #f)
 
 ;;======================================================================
 ;; Misc setup stuff
@@ -362,14 +362,11 @@
 		  (debug:print 0 "Failed to setup, exiting") 
 		  (exit 1)))
 	    ;; now can find our db
 	    (set! db (open-db))
 	    (change-directory work-area) 
-	    (let ((runconfigf (conc  *toppath* "/runconfigs.config")))
-	      (if (file-exists? runconfigf)
-		  (setup-env-defaults db runconfigf run-id)
-		  (debug:print 0 "WARNING: You do not have a run config file: " runconfigf)))
+	    (set-run-config-vars db run-id)
             ;; environment overrides are done *before* the remaining critical envars.
             (alist->env-vars env-ovrd)
 	    (set-megatest-env-vars db run-id)
 	    (set-item-env-vars itemdat)
             (save-environment-as-files "megatest")