diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index c044306ba3..4e1e3e9ca9 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -157,11 +157,9 @@ if (LINUX)
   if ( ${FORTIFY_SOURCE_RES} EQUAL 0 )
    add_definitions(-D_FORTIFY_SOURCE=2)
   endif()
-  set(CMAKE_CXX_FLAGS "-Wno-deprecated -Wno-unused-but-set-variable -Wno-unused-variable -Wno-placement-new ${CMAKE_CXX_FLAGS}")
 
   # gcc 4.3 and above don't like the LL boost and also
   # cause warnings due to our use of deprecated headers
-  add_definitions(-Wno-parentheses)
 
   add_definitions(
       -D_REENTRANT
@@ -176,18 +174,9 @@ if (LINUX)
       -pthread
       )
 
-  # <FS:ND> Enable C++11 support + gnu extensions
-  add_definitions(-std=gnu++11)
-  # </FS:ND>
-
-  # <FS:ND> Enable old C++ ABI
-  add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0)
-  # </FS:ND>
-
   # force this platform to accept TOS via external browser <FS:ND> No, do not.
   # add_definitions(-DEXTERNAL_TOS)
 
-
   add_definitions(-DAPPID=secondlife)
   add_compile_options(-fvisibility=hidden)
   # don't catch SIGCHLD in our base application class for the viewer - some of