diff --git a/CMakeLists.txt b/CMakeLists.txt
index 363edd2e9e..04bb7654ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -527,12 +527,6 @@ if (NOT WIN32)
 
   if (is_gcc)
     add_compile_options(-Wno-unused-but-set-variable -Wno-unused-local-typedefs)
-    # Generator expressions are not supported in add_definitions, use set_property instead
-    set_property(
-      DIRECTORY
-      APPEND
-      PROPERTY COMPILE_DEFINITIONS
-      $<$<OR:$<CONFIG:Debug>,$<CONFIG:DebugClassic>>:_FORTIFY_SOURCE=2>)
     add_compile_options($<$<OR:$<CONFIG:Debug>,$<CONFIG:DebugClassic>>:-O0>)
   endif (is_gcc)
 else(NOT WIN32)
diff --git a/SConstruct b/SConstruct
index 9fb5d129f5..a99b782d63 100644
--- a/SConstruct
+++ b/SConstruct
@@ -651,9 +651,6 @@ def config_env(toolchain, variant, env):
             # extra error checking into the code (e.g. std::vector will throw
             # for out-of-bounds conditions)
             if is_debug_variant(variant):
-                env.Append(CPPDEFINES={
-                    '_FORTIFY_SOURCE': 2
-                    })
                 env.Append(CCFLAGS=[
                     '-O0'
                     ])