diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 9599bf7cfc..f19f62799b 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -9,6 +9,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 	* Added missing WorkingDirectory value to vcproj-7.1, vcproj-8 projects.
 	  Now you can flawlessly run your compiled server with RUN button in
 	  the correct directory. Thanks to Konrad [Lupus]
+	- Reverted changes from the project files, due to incompatibility [Lupus]
 2008/03/10
 	* Added missing check to only allow the leader of a party to modify
 	  its exp share settings (bugreport:12) [ultramage]
diff --git a/vcproj-7.1/char-server_sql.vcproj b/vcproj-7.1/char-server_sql.vcproj
index 6883bc24e4..bb2765dfc7 100644
--- a/vcproj-7.1/char-server_sql.vcproj
+++ b/vcproj-7.1/char-server_sql.vcproj
@@ -17,8 +17,6 @@
 			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2">
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
@@ -78,8 +76,6 @@
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="TRUE">
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
diff --git a/vcproj-7.1/char-server_txt.vcproj b/vcproj-7.1/char-server_txt.vcproj
index 3573681bf4..786f0f067b 100644
--- a/vcproj-7.1/char-server_txt.vcproj
+++ b/vcproj-7.1/char-server_txt.vcproj
@@ -17,8 +17,6 @@
 			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2">
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
@@ -78,8 +76,6 @@
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="TRUE">
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
diff --git a/vcproj-7.1/login-server_sql.vcproj b/vcproj-7.1/login-server_sql.vcproj
index 90d526a144..37028adc52 100644
--- a/vcproj-7.1/login-server_sql.vcproj
+++ b/vcproj-7.1/login-server_sql.vcproj
@@ -16,8 +16,6 @@
 			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2">
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
@@ -77,8 +75,6 @@
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="TRUE">
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
diff --git a/vcproj-7.1/login-server_txt.vcproj b/vcproj-7.1/login-server_txt.vcproj
index 7d59a5c008..b31316fa0c 100644
--- a/vcproj-7.1/login-server_txt.vcproj
+++ b/vcproj-7.1/login-server_txt.vcproj
@@ -16,8 +16,6 @@
 			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2">
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
@@ -83,8 +81,6 @@
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="TRUE">
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
diff --git a/vcproj-7.1/map-server_sql.vcproj b/vcproj-7.1/map-server_sql.vcproj
index 35cffff902..c80671cff4 100644
--- a/vcproj-7.1/map-server_sql.vcproj
+++ b/vcproj-7.1/map-server_sql.vcproj
@@ -16,8 +16,6 @@
 			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2">
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4018
@@ -81,8 +79,6 @@
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="TRUE">
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4018
diff --git a/vcproj-7.1/map-server_txt.vcproj b/vcproj-7.1/map-server_txt.vcproj
index 851f39e214..e88722e62a 100644
--- a/vcproj-7.1/map-server_txt.vcproj
+++ b/vcproj-7.1/map-server_txt.vcproj
@@ -16,8 +16,6 @@
 			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2">
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4018
@@ -81,8 +79,6 @@
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="TRUE">
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/wd4018
diff --git a/vcproj-7.1/mapcache.vcproj b/vcproj-7.1/mapcache.vcproj
index 29a6dd32de..b0a09a288f 100644
--- a/vcproj-7.1/mapcache.vcproj
+++ b/vcproj-7.1/mapcache.vcproj
@@ -16,8 +16,6 @@
 			IntermediateDirectory="$(ProjectName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="2">
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
@@ -76,8 +74,6 @@
 			ConfigurationType="1"
 			CharacterSet="2"
 			WholeProgramOptimization="TRUE">
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
diff --git a/vcproj-8/char-server_sql.vcproj b/vcproj-8/char-server_sql.vcproj
index 2fce1e1cad..6a77ad245d 100644
--- a/vcproj-8/char-server_sql.vcproj
+++ b/vcproj-8/char-server_sql.vcproj
@@ -23,9 +23,6 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
@@ -115,9 +112,6 @@
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
diff --git a/vcproj-8/char-server_txt.vcproj b/vcproj-8/char-server_txt.vcproj
index 9ef0c1b042..531c5519e4 100644
--- a/vcproj-8/char-server_txt.vcproj
+++ b/vcproj-8/char-server_txt.vcproj
@@ -23,9 +23,6 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
@@ -114,9 +111,6 @@
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
diff --git a/vcproj-8/dbghelpplug.vcproj b/vcproj-8/dbghelpplug.vcproj
index 38ca8e2aaa..59d53f5c5d 100644
--- a/vcproj-8/dbghelpplug.vcproj
+++ b/vcproj-8/dbghelpplug.vcproj
@@ -22,9 +22,6 @@
 			ConfigurationType="2"
 			CharacterSet="2"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
@@ -111,9 +108,6 @@
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
diff --git a/vcproj-8/ladmin.vcproj b/vcproj-8/ladmin.vcproj
index 806d0ddd62..659540dd68 100644
--- a/vcproj-8/ladmin.vcproj
+++ b/vcproj-8/ladmin.vcproj
@@ -22,9 +22,6 @@
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
@@ -113,9 +110,6 @@
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
diff --git a/vcproj-8/login-server_sql.vcproj b/vcproj-8/login-server_sql.vcproj
index e794a39f2f..9a128df80f 100644
--- a/vcproj-8/login-server_sql.vcproj
+++ b/vcproj-8/login-server_sql.vcproj
@@ -23,9 +23,6 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
@@ -115,9 +112,6 @@
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
diff --git a/vcproj-8/login-server_txt.vcproj b/vcproj-8/login-server_txt.vcproj
index ef0733591f..d4611de8d0 100644
--- a/vcproj-8/login-server_txt.vcproj
+++ b/vcproj-8/login-server_txt.vcproj
@@ -22,9 +22,6 @@
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
@@ -114,9 +111,6 @@
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
diff --git a/vcproj-8/map-server_sql.vcproj b/vcproj-8/map-server_sql.vcproj
index d224c2765c..e752872d88 100644
--- a/vcproj-8/map-server_sql.vcproj
+++ b/vcproj-8/map-server_sql.vcproj
@@ -22,9 +22,6 @@
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
@@ -115,9 +112,6 @@
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
diff --git a/vcproj-8/map-server_txt.vcproj b/vcproj-8/map-server_txt.vcproj
index 7eed0af37e..f0a6f17a13 100644
--- a/vcproj-8/map-server_txt.vcproj
+++ b/vcproj-8/map-server_txt.vcproj
@@ -22,9 +22,6 @@
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
@@ -114,9 +111,6 @@
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
diff --git a/vcproj-8/mapcache.vcproj b/vcproj-8/mapcache.vcproj
index 13ed58df2f..d8ce121418 100644
--- a/vcproj-8/mapcache.vcproj
+++ b/vcproj-8/mapcache.vcproj
@@ -22,9 +22,6 @@
 			ConfigurationType="1"
 			CharacterSet="2"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
@@ -113,9 +110,6 @@
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
diff --git a/vcproj-8/txt-converter-char.vcproj b/vcproj-8/txt-converter-char.vcproj
index b048c6b6c6..bacd687a29 100644
--- a/vcproj-8/txt-converter-char.vcproj
+++ b/vcproj-8/txt-converter-char.vcproj
@@ -23,9 +23,6 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
@@ -112,9 +109,6 @@
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
diff --git a/vcproj-8/txt-converter-login.vcproj b/vcproj-8/txt-converter-login.vcproj
index 0efda99f90..3036b0f3f9 100644
--- a/vcproj-8/txt-converter-login.vcproj
+++ b/vcproj-8/txt-converter-login.vcproj
@@ -23,9 +23,6 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>
@@ -115,9 +112,6 @@
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
-			<DebugSettings
-				WorkingDirectory="$(SolutionDir)"
-			/>
 			<Tool
 				Name="VCPreBuildEventTool"
 			/>