diff --git a/CI/before_script.msvc.sh b/CI/before_script.msvc.sh
index 71de7ae4c1..2f22f827fd 100644
--- a/CI/before_script.msvc.sh
+++ b/CI/before_script.msvc.sh
@@ -872,7 +872,8 @@ fi
 	for DLL in $RUNTIME_DLLS; do
 		TARGET="$(basename "$DLL")"
 		if [[ "$DLL" == *":"* ]]; then
-			IFS=':'; SPLIT=( ${DLL} ); unset IFS
+			originalIFS="$IFS"
+			IFS=':'; SPLIT=( ${DLL} ); IFS=$originalIFS
 			DLL=${SPLIT[0]}
 			TARGET=${SPLIT[1]}
 		fi
@@ -900,19 +901,9 @@ if ! [ -z $ACTIVATE_MSVC ]; then
 	echo "Activating MSVC in the current shell."
 	command -v vswhere >/dev/null 2>&1 || { echo "Error: vswhere is not on the path."; wrappedExit 1; }
 
-	# capture CMD environment so we know what's been changed
-	declare -A originalCmdEnv
-	originalIFS="$IFS"
-	IFS=$'\n\r'
-	for pair in $(cmd //c "set"); do
-		IFS='=' read -r -a separatedPair <<< "${pair}"
-		originalCmdEnv["${separatedPair[0]}"]="${separatedPair[1]}"
-	done
-
 	MSVC_INSTALLATION_PATH=$(vswhere -legacy -version "[$MSVC_VER,$(awk "BEGIN { print $MSVC_REAL_VER + 1; exit }"))" -property installationPath)
-	# capture CMD environment in a shell with MSVC activated
 	if [ $MSVC_REAL_VER -ge 15 ]; then
-		cmdEnv="$(cmd //c "${MSVC_INSTALLATION_PATH}\Common7\Tools\VsDevCmd.bat" -no_logo -arch=$([ $BITS -eq 64 ] && echo "amd64" || echo "x86") -host_arch=$([ $(uname -m) == 'x86_64' ] && echo "amd64" || echo "x86") "&&" set)"
+		echo "@\"${MSVC_INSTALLATION_PATH}\Common7\Tools\VsDevCmd.bat\" -no_logo -arch=$([ $BITS -eq 64 ] && echo "amd64" || echo "x86") -host_arch=$([ $(uname -m) == 'x86_64' ] && echo "amd64" || echo "x86")" > ActivateMSVC.bat
 	else
 		if [ $(uname -m) == 'x86_64' ]; then
 			if [ $BITS -eq 64 ]; then
@@ -927,19 +918,33 @@ if ! [ -z $ACTIVATE_MSVC ]; then
 				compiler=x86
 			fi
 		fi
-		cmdEnv="$(cmd //c "${MSVC_INSTALLATION_PATH}\VC\vcvarsall.bat" $compiler "&&" set)"
+		echo "@\"${MSVC_INSTALLATION_PATH}\VC\vcvarsall.bat\" $compiler" > ActivateMSVC.bat
 	fi
 
+	# capture CMD environment so we know what's been changed
+	declare -A originalCmdEnv
+	originalIFS="$IFS"
+	IFS=$'\n\r'
+	for pair in $(cmd //c "set"); do
+		IFS='=' read -r -a separatedPair <<< "${pair}"
+		originalCmdEnv["${separatedPair[0]}"]="${separatedPair[1]}"
+	done
+	
+	# capture CMD environment in a shell with MSVC activated
+	cmdEnv="$(cmd //c ActivateMSVC.bat "&&" set)"
+
 	declare -A cmdEnvChanges
 	for pair in $cmdEnv; do
-		IFS='=' read -r -a separatedPair <<< "${pair}"
-		key="${separatedPair[0]}"
-		value="${separatedPair[1]}"
-		if ! [ ${originalCmdEnv[$key]+_} ] || [ "${originalCmdEnv[$key]}" != "$value" ]; then
-			if [ $key != 'PATH' ] && [ $key != 'path' ] && [ $key != 'Path' ]; then
-				export "$key=$value"
-			else
-				export PATH=$(windowsSystemPathAsUnix $value)
+		if [ -n "$pair" ]; then
+			IFS='=' read -r -a separatedPair <<< "${pair}"
+			key="${separatedPair[0]}"
+			value="${separatedPair[1]}"
+			if ! [ ${originalCmdEnv[$key]+_} ] || [ "${originalCmdEnv[$key]}" != "$value" ]; then
+				if [ $key != 'PATH' ] && [ $key != 'path' ] && [ $key != 'Path' ]; then
+					export "$key=$value"
+				else
+					export PATH=$(windowsSystemPathAsUnix $value)
+				fi
 			fi
 		fi
 	done