1 files changed, 0 insertions, 8 deletions
diff --git a/system/graphics/src/DriverCrashGuard.cpp b/system/graphics/src/DriverCrashGuard.cpp
index 3b69d387c..333c624e9 100644
--- a/system/graphics/src/DriverCrashGuard.cpp
+++ b/system/graphics/src/DriverCrashGuard.cpp
@@ -68,19 +68,11 @@ AreCrashGuardsEnabled()
   if (XRE_IsGPUProcess()) {
     return false;
   }
-#ifdef NIGHTLY_BUILD
-  // We only use the crash guard on non-nightly channels, since the nightly
-  // channel is for development and having graphics features perma-disabled
-  // is rather annoying.  Unless the user forces is with an environment
-  // variable, which comes in handy for testing.
-  return gfxEnv::ForceCrashGuardNightly();
-#else
   // Check to see if all guards have been disabled through the environment.
   if (gfxEnv::DisableCrashGuard()) {
     return false;
   }
   return true;
-#endif
 }
 
 void