diff --git a/Data/Sys/GameSettings/GBS.ini b/Data/Sys/GameSettings/GBS.ini
index 1cbb95786d..f9b4d92c48 100644
--- a/Data/Sys/GameSettings/GBS.ini
+++ b/Data/Sys/GameSettings/GBS.ini
@@ -17,7 +17,3 @@ EmulationIssues =
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video_Settings]
-FastDepthCalc = False
-
diff --git a/Data/Sys/GameSettings/GM3.ini b/Data/Sys/GameSettings/GM3.ini
index 2828527275..5575cdf448 100644
--- a/Data/Sys/GameSettings/GM3.ini
+++ b/Data/Sys/GameSettings/GM3.ini
@@ -5,7 +5,7 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for the videos to display. Shadow issues with fastdepth (D3D).
+EmulationIssues = Needs real xfb for the videos to display.
 EmulationStateId = 4
 
 [OnLoad]
@@ -20,4 +20,3 @@ EmulationStateId = 4
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/GMD.ini b/Data/Sys/GameSettings/GMD.ini
index c5b53f55a0..babc65013f 100644
--- a/Data/Sys/GameSettings/GMD.ini
+++ b/Data/Sys/GameSettings/GMD.ini
@@ -5,7 +5,7 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for the videos to display. Shadow issues with fastdepth (D3D).
+EmulationIssues = Needs real xfb for the videos to display.
 EmulationStateId = 4
 
 [OnLoad]
@@ -20,4 +20,3 @@ EmulationStateId = 4
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/GQX.ini b/Data/Sys/GameSettings/GQX.ini
index 7b3270098a..881b29b8e2 100644
--- a/Data/Sys/GameSettings/GQX.ini
+++ b/Data/Sys/GameSettings/GQX.ini
@@ -5,7 +5,7 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Needs real xfb for the videos to display. Shadow issues with fastdepth (D3D).
+EmulationIssues = Needs real xfb for the videos to display.
 EmulationStateId = 4
 
 [OnLoad]
@@ -20,4 +20,3 @@ EmulationStateId = 4
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/GZL.ini b/Data/Sys/GameSettings/GZL.ini
index 0d0835cbba..484717aecb 100644
--- a/Data/Sys/GameSettings/GZL.ini
+++ b/Data/Sys/GameSettings/GZL.ini
@@ -21,8 +21,5 @@ EmulationIssues =
 EFBAccessEnable = True
 EFBToTextureEnable = False
 
-[Video_Settings]
-FastDepthCalc = False
-
 [Video_Stereoscopy]
 StereoConvergence = 115
diff --git a/Data/Sys/GameSettings/R44.ini b/Data/Sys/GameSettings/R44.ini
index b8df1e137b..edddbbfe95 100644
--- a/Data/Sys/GameSettings/R44.ini
+++ b/Data/Sys/GameSettings/R44.ini
@@ -21,4 +21,3 @@ EmulationIssues =
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
-FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/RNJ.ini b/Data/Sys/GameSettings/RNJ.ini
index 22e9646750..ede7cede01 100644
--- a/Data/Sys/GameSettings/RNJ.ini
+++ b/Data/Sys/GameSettings/RNJ.ini
@@ -16,6 +16,3 @@ EmulationIssues =
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video_Settings]
-FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/S59.ini b/Data/Sys/GameSettings/S59.ini
index c06fb585d8..05fd27b044 100644
--- a/Data/Sys/GameSettings/S59.ini
+++ b/Data/Sys/GameSettings/S59.ini
@@ -19,5 +19,3 @@ EmulationStateId = 4
 
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
-FastDepthCalc = False
-
diff --git a/Data/Sys/GameSettings/SF8.ini b/Data/Sys/GameSettings/SF8.ini
index 68d1902e93..a501780178 100644
--- a/Data/Sys/GameSettings/SF8.ini
+++ b/Data/Sys/GameSettings/SF8.ini
@@ -18,7 +18,6 @@ EmulationIssues = Sound crackling can be fixed by lle audio.
 # Add action replay cheats here.
 
 [Video_Settings]
-FastDepthCalc = False
 SafeTextureCacheColorSamples = 512
 
 [Video_Stereoscopy]
diff --git a/Data/Sys/GameSettings/SOU.ini b/Data/Sys/GameSettings/SOU.ini
index 3c66b17351..97124c52f7 100644
--- a/Data/Sys/GameSettings/SOU.ini
+++ b/Data/Sys/GameSettings/SOU.ini
@@ -6,7 +6,7 @@
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
 EmulationStateId = 4
-EmulationIssues = Needs real wiimote and motion plus. Time stone transition needs Fast Depth off. 
+EmulationIssues = Needs real wiimote and motion plus.
 
 [OnLoad]
 # Add memory patches to be loaded once on boot here.
@@ -18,6 +18,3 @@ EmulationIssues = Needs real wiimote and motion plus. Time stone transition need
 [Video_Hacks]
 EFBAccessEnable = True
 EFBEmulateFormatChanges = True
-
-[Video_Settings]
-FastDepthCalc = False
diff --git a/Data/Sys/GameSettings/WMJ.ini b/Data/Sys/GameSettings/WMJ.ini
index d79de217ca..859fd7d703 100644
--- a/Data/Sys/GameSettings/WMJ.ini
+++ b/Data/Sys/GameSettings/WMJ.ini
@@ -5,7 +5,7 @@
 
 [EmuState]
 # The Emulation State. 1 is worst, 5 is best, 0 is not set.
-EmulationIssues = Glitches in the game menu with fast depth enabled.
+EmulationIssues =
 EmulationStateId = 4
 
 [OnLoad]
@@ -16,6 +16,3 @@ EmulationStateId = 4
 
 [ActionReplay]
 # Add action replay cheats here.
-
-[Video_Settings]
-FastDepthCalc = False
diff --git a/Source/Core/VideoCommon/TextureConversionShader.cpp b/Source/Core/VideoCommon/TextureConversionShader.cpp
index 18b67817fe..cccb7e7334 100644
--- a/Source/Core/VideoCommon/TextureConversionShader.cpp
+++ b/Source/Core/VideoCommon/TextureConversionShader.cpp
@@ -158,7 +158,7 @@ static void WriteSampleColor(char*& p, const char* colorComp, const char* dest,
 
     // Handle D3D depth inversion.
     if (depth)
-      WRITE(p, "  %s = 1.0f - %s;\n", dest, dest);
+      WRITE(p, "  %s = 1.0 - %s;\n", dest, dest);
   }
 }