Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -216,10 +216,14 @@
 	chmod a+x $@
 
 $(PREFIX)/bin/mt_runstep : utils/mt_runstep
 	$(INSTALL) $< $@
 	chmod a+x $@
+
+$(PREFIX)/bin/serialize-env: serialize-env.scm
+	csc serialize-env.scm
+	$(INSTALL) serialize-env $@
 
 $(PREFIX)/bin/mt_ezstep : utils/mt_ezstep
 	$(INSTALL) $< $@
 	chmod a+x $@
 
@@ -274,10 +278,11 @@
 	chmod a+x $(PREFIX)/bin/dashboard
 	$(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard
 
 install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest \
           $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \
+          $(PREFIX)/bin/serialize-env
 	  $(PREFIX)/bin/nbfind $(PREFIX)/bin/loadrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \
 	  $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun \
 	  $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun $(PREFIX)/bin/mtutil \
 	  $(PREFIX)/bin/tcmt $(PREFIX)/share/db/mt-pg.sql \
           $(PREFIX)/share/js/jquery-3.1.0.slim.min.js 

Index: common.scm
==================================================================
--- common.scm
+++ common.scm
@@ -2081,15 +2081,19 @@
 
 ;; clear vars matching pattern, run proc, set vars back
 ;; if proc is a string run that string as a command with
 ;; system.
 ;;
-(define *common:orig-env* (filter-map (lambda (x)
-                                        (if (string-match "^MT_.*" (car x))
-                                            #f
-                                            x))
-                                      (get-environment-variables)))
+(define *common:orig-env* (if (get-environment-variable "MT_ORIG_ENV")
+                              (with-input-from-string
+                                  (z3:decode-buffer (base64:base64-decode (get-environment-variable "MT_ORIG_ENV")))
+                                read)
+                              (filter-map (lambda (x)
+                                            (if (string-match "^MT_.*" (car x))
+                                                #f
+                                                x))
+                                          (get-environment-variables))))
 
 (define (common:with-orig-env proc)
   (let  ((current-env (get-environment-variables)))
     (for-each (lambda (x) (unsetenv (car x)))             current-env)
     (for-each (lambda (x) (setenv (car x) (cdr x))) *common:orig-env*)

Index: utils/mk_wrapper
==================================================================
--- utils/mk_wrapper
+++ utils/mk_wrapper
@@ -23,10 +23,14 @@
 cfgfile="$prefix/bin/.$(lsb_release -sr)/cfg.sh"
 
 if [ "$LD_LIBRARY_PATH" != "" ];then
   echo "INFO: Using LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >&2
 ( cat << __EOF
+if [ -z \$MT_ORIG_ENV ]; then
+    export MT_ORIG_ENV=\$( $prefix/bin/serialize-env )
+fi
+
 if [ "\$LD_LIBRARY_PATH" != "" ];then
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:\$LD_LIBRARY_PATH
 else
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 fi

Index: wrappers/cfg.sh
==================================================================
--- wrappers/cfg.sh
+++ wrappers/cfg.sh
@@ -12,10 +12,14 @@
 #     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #     GNU General Public License for more details.
 # 
 #     You should have received a copy of the GNU General Public License
 #     along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
+
+if [ -z $MT_ORIG_ENV ]; then
+    export MT_ORIG_ENV=$( PREFIX/bin/serialize-env )
+fi
 
 if [ "$LD_LIBRARY_PATH" != "" ];then
   export LD_LIBRARY_PATH=PREFIX:PREFIX/lib:PREFIX/lib64:$LD_LIBRARY_PATH
 else
   export LD_LIBRARY_PATH=PREFIX:PREFIX/lib:PREFIX/lib64