diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index 82d0edfb..528df6a9 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -1361,7 +1361,7 @@ static void CL_OldGame(void)
 	{
 		// change back to previous fs_game
 		cl_oldGameSet = qfalse;
-		Cvar_Set("fs_game", cl_oldGame);
+		Cvar_Set2("fs_game", cl_oldGame, qtrue);
 		FS_ConditionalRestart(clc.checksumFeed, qfalse);
 	}
 }
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index 6580073b..11bcaf19 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -2404,9 +2404,6 @@ void Com_GameRestart(int checksumFeed, qboolean disconnect)
 			CL_Shutdown("Game directory changed", disconnect, qfalse);
 		}
 
-		// change com_basegame to latched value
-		com_basegame = Cvar_Get("com_basegame", BASEGAME, CVAR_LATCH|CVAR_NORESTART);
-
 		FS_Restart(checksumFeed);
 	
 		// Clean out any user and VM created cvars
@@ -2699,7 +2696,7 @@ void Com_Init( char *commandLine ) {
 	CL_InitKeyCommands();
 
 	com_standalone = Cvar_Get("com_standalone", "0", CVAR_ROM);
-	com_basegame = Cvar_Get("com_basegame", BASEGAME, CVAR_LATCH|CVAR_NORESTART);
+	com_basegame = Cvar_Get("com_basegame", BASEGAME, CVAR_INIT);
 	com_homepath = Cvar_Get("com_homepath", "", CVAR_INIT|CVAR_PROTECTED);
 
 	FS_InitFilesystem ();
diff --git a/code/qcommon/cvar.c b/code/qcommon/cvar.c
index f12eb7d7..5a0e6906 100644
--- a/code/qcommon/cvar.c
+++ b/code/qcommon/cvar.c
@@ -638,29 +638,18 @@ Cvar_SetSafe
 void Cvar_SetSafe( const char *var_name, const char *value )
 {
 	int flags = Cvar_Flags( var_name );
-	qboolean force = qtrue;
 
-	if ( flags != CVAR_NONEXISTENT )
+	if((flags != CVAR_NONEXISTENT) && (flags & CVAR_PROTECTED))
 	{
-		if ( flags & CVAR_PROTECTED )
-		{
-			if( value )
-				Com_Error( ERR_DROP, "Restricted source tried to set "
-					"\"%s\" to \"%s\"", var_name, value );
-			else
-				Com_Error( ERR_DROP, "Restricted source tried to "
-					"modify \"%s\"", var_name );
-			return;
-		}
-
-		// don't let VMs or server change engine latched cvars instantly
-		if ( ( flags & CVAR_LATCH ) && !( flags & CVAR_VM_CREATED ) )
-		{
-			force = qfalse;
-		}
+		if( value )
+			Com_Error( ERR_DROP, "Restricted source tried to set "
+				"\"%s\" to \"%s\"", var_name, value );
+		else
+			Com_Error( ERR_DROP, "Restricted source tried to "
+				"modify \"%s\"", var_name );
+		return;
 	}
-
-	Cvar_Set2 (var_name, value, force);
+	Cvar_Set( var_name, value );
 }
 
 /*
@@ -1376,13 +1365,7 @@ void Cvar_Register(vmCvar_t *vmCvar, const char *varName, const char *defaultVal
 	if ( cv && ( cv->flags & CVAR_PROTECTED ) ) {
 		Com_DPrintf( S_COLOR_YELLOW "WARNING: VM tried to register protected cvar '%s' with value '%s'%s\n",
 			varName, defaultValue, ( flags & ~cv->flags ) != 0 ? " and new flags" : "" );
-	}
-	// Don't set engine latch cvar to latched value.
-	else if ( cv && ( cv->flags & CVAR_LATCH ) && !( cv->flags & CVAR_VM_CREATED ) ) {
-		cv->flags |= flags;
-		cvar_modifiedFlags |= flags;
-	}
-	else {
+	} else {
 		cv = Cvar_Get(varName, defaultValue, flags | CVAR_VM_CREATED);
 	}
 
diff --git a/code/qcommon/files.c b/code/qcommon/files.c
index eb61af9c..71613cd8 100644
--- a/code/qcommon/files.c
+++ b/code/qcommon/files.c
@@ -3319,13 +3319,13 @@ static void FS_Startup( const char *gameName )
 
 	fs_debug = Cvar_Get( "fs_debug", "0", 0 );
 	fs_basepath = Cvar_Get ("fs_basepath", Sys_DefaultInstallPath(), CVAR_INIT|CVAR_PROTECTED );
-	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_LATCH|CVAR_NORESTART );
+	fs_basegame = Cvar_Get ("fs_basegame", "", CVAR_INIT );
 	homePath = Sys_DefaultHomePath();
 	if (!homePath || !homePath[0]) {
 		homePath = fs_basepath->string;
 	}
 	fs_homepath = Cvar_Get ("fs_homepath", homePath, CVAR_INIT|CVAR_PROTECTED );
-	fs_gamedirvar = Cvar_Get ("fs_game", "", CVAR_LATCH|CVAR_NORESTART|CVAR_SYSTEMINFO );
+	fs_gamedirvar = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO );
 
 	if (!gameName[0]) {
 		Cvar_ForceReset( "com_basegame" );
@@ -3430,6 +3430,8 @@ static void FS_Startup( const char *gameName )
 	// print the current search paths
 	FS_Path_f();
 
+	fs_gamedirvar->modified = qfalse; // We just loaded, it's not modified
+
 	Com_Printf( "----------------------\n" );
 
 #ifdef FS_MISSING
@@ -4077,10 +4079,17 @@ Return qtrue if restarting due to game directory changed, qfalse otherwise
 */
 qboolean FS_ConditionalRestart(int checksumFeed, qboolean disconnect)
 {
-	if (com_basegame->latchedString || fs_basegame->latchedString || fs_gamedirvar->latchedString)
+	if(fs_gamedirvar->modified)
 	{
-		Com_GameRestart(checksumFeed, disconnect);
-		return qtrue;
+		if(FS_FilenameCompare(lastValidGame, fs_gamedirvar->string) &&
+				(*lastValidGame || FS_FilenameCompare(fs_gamedirvar->string, com_basegame->string)) &&
+				(*fs_gamedirvar->string || FS_FilenameCompare(lastValidGame, com_basegame->string)))
+		{
+			Com_GameRestart(checksumFeed, disconnect);
+			return qtrue;
+		}
+		else
+			fs_gamedirvar->modified = qfalse;
 	}
 
 	if(checksumFeed != fs_checksumFeed)