diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
index 525bd90574f..931a811d897 100644
--- a/storage/connect/CMakeLists.txt
+++ b/storage/connect/CMakeLists.txt
@@ -72,13 +72,6 @@ IF(UNIX)
     message(STATUS "CONNECT: GCC: Some warnings disabled")
   endif(WITH_WARNINGS)
 
-  # Avoid compilation failure in maintainer mode
-  IF(CMAKE_COMPILER_IS_GNUCXX)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-overloaded-virtual -Wno-error=type-limits")
-    string(REPLACE "-Woverloaded-virtual" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    string(REPLACE "-Woverloaded-virtual" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-  ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-
   add_definitions( -DUNIX -DLINUX -DUBUNTU )
 
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -fexceptions -fPIC ")