diff --git a/Docs/sphinx_documentation/source/BuildingAMReX.rst b/Docs/sphinx_documentation/source/BuildingAMReX.rst
index 8000e754459..0f3787bd85a 100644
--- a/Docs/sphinx_documentation/source/BuildingAMReX.rst
+++ b/Docs/sphinx_documentation/source/BuildingAMReX.rst
@@ -532,8 +532,8 @@ The list of available options is reported in the :ref:`table <tab:cmakevar>` bel
    +------------------------------+-------------------------------------------------+-------------------------+-----------------------+
    | AMReX_PROBINIT               |  Enable support for probin file                 | Platform dependent      | YES, NO               |
    +------------------------------+-------------------------------------------------+-------------------------+-----------------------+
-   | AMReX_FLATTEN_FOR            |  Enable flattening of ParallelFor and similar   | YES unless for Debug    | YES, NO               |
-   |                              |  functions for host code                        | build                   |                       |
+   | AMReX_FLATTEN_FOR            |  Enable flattening of ParallelFor and similar   | NO                      | YES, NO               |
+   |                              |  functions for host code                        |                         |                       |
    +------------------------------+-------------------------------------------------+-------------------------+-----------------------+
 .. raw:: latex
 
diff --git a/Tools/CMake/AMReXOptions.cmake b/Tools/CMake/AMReXOptions.cmake
index d19477e7698..85c280f684f 100644
--- a/Tools/CMake/AMReXOptions.cmake
+++ b/Tools/CMake/AMReXOptions.cmake
@@ -377,11 +377,7 @@ endif ()
 
 print_option( AMReX_ASSERTIONS )
 
-if ( "${CMAKE_BUILD_TYPE}" MATCHES "Debug" )
-   option( AMReX_FLATTEN_FOR "Enable flattening of ParallelFor and other similar functions" OFF)
-else ()
-   option( AMReX_FLATTEN_FOR "Enable flattening of ParallelFor and other similar functions" ON)
-endif ()
+option( AMReX_FLATTEN_FOR "Enable flattening of ParallelFor and other similar functions" OFF)
 print_option( AMReX_FLATTEN_FOR )
 
 option(AMReX_BOUND_CHECK  "Enable bound checking in Array4 class" OFF)
diff --git a/Tools/GNUMake/Make.defs b/Tools/GNUMake/Make.defs
index 3394ce0d9ad..31f72c4abe8 100644
--- a/Tools/GNUMake/Make.defs
+++ b/Tools/GNUMake/Make.defs
@@ -314,7 +314,7 @@ endif
 ifdef USE_FLATTEN_FOR
   USE_FLATTEN_FOR := $(strip $(USE_FLATTEN_FOR))
 else
-  USE_FLATTEN_FOR := TRUE
+  USE_FLATTEN_FOR := FALSE
 endif
 
 ifdef WARN_ALL