diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 85e1f0115e1d40342ad80105c4b7c62473abbf92..ddb03441881f0dac5c2d3307f02d048ded29e5f0 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -331,9 +331,11 @@ else()
   add_definitions(-URELEASE_SHOW_ASSERT)
 endif()
 
-option(DISABLE_TIMING "Disable all but core fast timers" OFF)
-if(DISABLE_TIMING)
-  add_definitions(-DAL_DISABLE_TIMERS=1)
+option(ENABLE_TIMING "Enable all fast timers" ON)
+if(ENABLE_TIMING)
+  add_definitions(-DAL_ENABLE_ALL_TIMERS=1)
+else()
+  add_definitions(-DAL_ENABLE_ALL_TIMERS=0)
 endif()