diff --git a/vagrant/Xenial/bin/launcher b/vagrant/Xenial/bin/launcher
index 50b04b0f39..32ada2fa1b 100755
--- a/vagrant/Xenial/bin/launcher
+++ b/vagrant/Xenial/bin/launcher
@@ -1,4 +1,21 @@
 #!/bin/bash
+export I18NPATH=$SNAP/usr/share/i18n
+export LOCPATH=$SNAP_USER_DATA
+
+LANG=en_US
+ENC=UTF-8
+LOC="$LANG.$ENC"
+
+# generate a locale so we get properly working charsets and graphics
+if [ ! -e $SNAP_USER_DATA/$LOC ]; then
+  $SNAP/usr/bin/localedef --prefix=$SNAP_USER_DATA -f $ENC -i $LANG $SNAP_USER_DATA/$LOC
+fi
+
+export LC_ALL=$LOC
+export LANG=$LOC
+export LANGUAGE=${LANG%_*}
+env >& $SNAP_USER_DATA/env
+
 export LIBGL_DRIVERS_PATH=$SNAP/usr/lib/x86_64-linux-gnu/dri
 export GTK_PATH=$SNAP/usr/lib/x86_64-linux-gnu/gtk-2.0/modules
 export LD_LIBRARY_PATH=$SNAP/usr/lib/x86_64-linux-gnu/gtk-2.0/modules:$LD_LIBRARY_PATH
@@ -9,7 +26,8 @@ export PYTHONHOME="$SNAP/usr"
 export PYTHONPATH="$SNAP/usr"
 export XDG_DATA_DIR="$SNAP/usr/share/glib-2.0/schemas"
 export GSETTINGS_SCHEMA_DIR="$SNAP/usr/share/glib-2.0/schemas"
-export I18NPATH=$SNAP/usr/share/i18n/locales
-export LOCPATH=$SNAP/usr/lib/locale/
+export LANG=en_US.UTF-8
+export FREECAD_USER_DATA="$SNAP_USER_DATA"
+export XDG_CONFIG_HOME="$SNAP_USER_DATA"
 exec "$SNAP/opt/local/FreeCAD-0.17/bin/FreeCAD" -u $SNAP_USER_DATA/user.cfg -s $SNAP_USER_DATA/system.cfg "$@"
 
diff --git a/vagrant/Xenial/launcher b/vagrant/Xenial/launcher
deleted file mode 100755
index 32ada2fa1b..0000000000
--- a/vagrant/Xenial/launcher
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-export I18NPATH=$SNAP/usr/share/i18n
-export LOCPATH=$SNAP_USER_DATA
-
-LANG=en_US
-ENC=UTF-8
-LOC="$LANG.$ENC"
-
-# generate a locale so we get properly working charsets and graphics
-if [ ! -e $SNAP_USER_DATA/$LOC ]; then
-  $SNAP/usr/bin/localedef --prefix=$SNAP_USER_DATA -f $ENC -i $LANG $SNAP_USER_DATA/$LOC
-fi
-
-export LC_ALL=$LOC
-export LANG=$LOC
-export LANGUAGE=${LANG%_*}
-env >& $SNAP_USER_DATA/env
-
-export LIBGL_DRIVERS_PATH=$SNAP/usr/lib/x86_64-linux-gnu/dri
-export GTK_PATH=$SNAP/usr/lib/x86_64-linux-gnu/gtk-2.0/modules
-export LD_LIBRARY_PATH=$SNAP/usr/lib/x86_64-linux-gnu/gtk-2.0/modules:$LD_LIBRARY_PATH
-export GTK_DATA_PREFIX=$SNAP_USER_DATA
-export GTK_EXE_PREFIX=$SNAP/usr
-export GDK_PIXBUF_MODULE_FILE=$SNAP/usr/lib/x86_64-linux-gnu/gdk-pixbuf-2.0/2.10.0/loaders.cache
-export PYTHONHOME="$SNAP/usr"
-export PYTHONPATH="$SNAP/usr"
-export XDG_DATA_DIR="$SNAP/usr/share/glib-2.0/schemas"
-export GSETTINGS_SCHEMA_DIR="$SNAP/usr/share/glib-2.0/schemas"
-export LANG=en_US.UTF-8
-export FREECAD_USER_DATA="$SNAP_USER_DATA"
-export XDG_CONFIG_HOME="$SNAP_USER_DATA"
-exec "$SNAP/opt/local/FreeCAD-0.17/bin/FreeCAD" -u $SNAP_USER_DATA/user.cfg -s $SNAP_USER_DATA/system.cfg "$@"
-