diff --git a/modules/find/FindHYPRE.cmake b/modules/find/FindHYPRE.cmake
index b6d35342ca0d3df8513becfb3c516a98c357f2b7..2625c8fe3d65374bcd42924009e1724d65e7f2b5 100644
--- a/modules/find/FindHYPRE.cmake
+++ b/modules/find/FindHYPRE.cmake
@@ -109,14 +109,6 @@ if(HYPRE_LIBRARIES)
     if (MPI_C_INCLUDE_PATH)
       list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
     endif()
-    if (MPI_C_LINK_FLAGS)
-      if (${MPI_C_LINK_FLAGS} MATCHES "  -")
-        string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS})
-      endif()
-      if (NOT CMAKE_C_COMPILER_ID MATCHES "Intel")
-        list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}")
-      endif()
-    endif()
     list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}")
   endif()
   # libm
diff --git a/modules/find/FindMUMPS.cmake b/modules/find/FindMUMPS.cmake
index 31a5d8a248b2335e005af0ce308f9771324282f4..512a261ca0f86bc0c7b4c9b0b363fd370b374266 100644
--- a/modules/find/FindMUMPS.cmake
+++ b/modules/find/FindMUMPS.cmake
@@ -432,15 +432,6 @@ if(MUMPS_LIBRARIES)
     if (MPI_C_INCLUDE_PATH)
       list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
     endif()
-    if (MPI_Fortran_LINK_FLAGS)
-      if (${MPI_Fortran_LINK_FLAGS} MATCHES "  -")
-        string(REGEX REPLACE " -" "-" MPI_Fortran_LINK_FLAGS ${MPI_Fortran_LINK_FLAGS})
-      endif()
-      # bug with intelmpi --enable-new-dtags -Xlinker -rpath -Xlinker ...
-      if (NOT CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
-        list(APPEND REQUIRED_LDFLAGS "${MPI_Fortran_LINK_FLAGS}")
-      endif()
-    endif()
     list(APPEND REQUIRED_LIBS "${MPI_Fortran_LIBRARIES}")
   endif()
   # SCOTCH
diff --git a/modules/find/FindPAMPA.cmake b/modules/find/FindPAMPA.cmake
index ba888d72861421f5558ffddbbcdba7fbe653de28..2b2acaad23e4713359ca382e8f93965c3d08cdb1 100644
--- a/modules/find/FindPAMPA.cmake
+++ b/modules/find/FindPAMPA.cmake
@@ -125,14 +125,6 @@ if(PAMPA_LIBRARIES)
     if (MPI_C_INCLUDE_PATH)
       list(APPEND CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_PATH}")
     endif()
-    if (MPI_C_LINK_FLAGS)
-      if (${MPI_C_LINK_FLAGS} MATCHES "  -")
-        string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS})
-      endif()
-      if (NOT CMAKE_C_COMPILER_ID MATCHES "Intel")
-        list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}")
-      endif()
-    endif()
     list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}")
   endif()
   # PTSCOTCH
diff --git a/modules/find/FindPARMETIS.cmake b/modules/find/FindPARMETIS.cmake
index d8056e1cb1f4ba68f9fd866028563dbe6adac6ea..06eda037d2608a917023cc6ed00aa5e622557842 100644
--- a/modules/find/FindPARMETIS.cmake
+++ b/modules/find/FindPARMETIS.cmake
@@ -130,14 +130,6 @@ if(PARMETIS_LIBRARIES)
     if (MPI_C_INCLUDE_PATH)
       list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
     endif()
-    if (MPI_C_LINK_FLAGS)
-      if (${MPI_C_LINK_FLAGS} MATCHES "  -")
-        string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS})
-      endif()
-      if (NOT CMAKE_C_COMPILER_ID MATCHES "Intel")
-        list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}")
-      endif()
-    endif()
     list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}")
   endif()
   # m
diff --git a/modules/find/FindPTSCOTCH.cmake b/modules/find/FindPTSCOTCH.cmake
index 58b4549b9b5780e1b25bfd558549a44185e82981..37e9b80c6e5fd97ee2c7fd319cb2647762e30f78 100644
--- a/modules/find/FindPTSCOTCH.cmake
+++ b/modules/find/FindPTSCOTCH.cmake
@@ -146,14 +146,6 @@ if(PTSCOTCH_LIBRARIES)
     if (MPI_C_INCLUDE_PATH)
       list(APPEND REQUIRED_INCDIRS "${MPI_C_INCLUDE_PATH}")
     endif()
-    if (MPI_C_LINK_FLAGS)
-      if (${MPI_C_LINK_FLAGS} MATCHES "  -")
-        string(REGEX REPLACE " -" "-" MPI_C_LINK_FLAGS ${MPI_C_LINK_FLAGS})
-      endif()
-      if (NOT CMAKE_C_COMPILER_ID MATCHES "Intel")
-        list(APPEND REQUIRED_LDFLAGS "${MPI_C_LINK_FLAGS}")
-      endif()
-    endif()
     list(APPEND REQUIRED_LIBS "${MPI_C_LIBRARIES}")
   endif()
   # THREADS