diff --git a/include/ompi_config_bottom.h b/include/ompi_config_bottom.h
index 1cf1444907..91bd46d53f 100644
--- a/include/ompi_config_bottom.h
+++ b/include/ompi_config_bottom.h
@@ -38,9 +38,6 @@ typedef enum { false, true } bool;
  */
 #define OMPI_HAVE_THREADS (OMPI_HAVE_SOLARIS_THREADS || OMPI_HAVE_POSIX_THREADS)
 
-/* parameter indicating if to check MPI arguments */
-extern bool ompi_mpi_param_check;
-
 /*
  * Do we have <stdint.h>?
  */
diff --git a/src/mpi/f77/comm_create_keyval_f.c b/src/mpi/f77/comm_create_keyval_f.c
index a7952ac621..e073f18634 100644
--- a/src/mpi/f77/comm_create_keyval_f.c
+++ b/src/mpi/f77/comm_create_keyval_f.c
@@ -58,17 +58,6 @@ void mpi_comm_create_keyval_f(MPI_Fint *comm_copy_attr_fn,
     ompi_attribute_fn_ptr_union_t copy_fn;
     ompi_attribute_fn_ptr_union_t del_fn;
 
-    if (MPI_PARAM_CHECK) {
-        if ((NULL == comm_copy_attr_fn)   || 
-            (NULL == comm_delete_attr_fn) ||
-            (NULL == comm_keyval)              ) {
-            c_err = OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD,
-                                           MPI_ERR_ARG,
-                                           FUNC_NAME)
-	    *ierr = OMPI_INT_2_FINT(c_err);
-        }
-    }
-
     copy_fn.attr_F_copy_fn = (MPI_F_copy_function *)comm_copy_attr_fn;
     del_fn.attr_F_delete_fn = (MPI_F_delete_function *)comm_delete_attr_fn;
 
diff --git a/src/mpi/f77/iprobe_f.c b/src/mpi/f77/iprobe_f.c
index c616715935..3f58132018 100644
--- a/src/mpi/f77/iprobe_f.c
+++ b/src/mpi/f77/iprobe_f.c
@@ -11,6 +11,7 @@
 #include "mpi/f77/constants.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
+#include "mpi/runtime/params.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
 #pragma weak PMPI_IPROBE = mpi_iprobe_f
diff --git a/src/mpi/f77/keyval_create_f.c b/src/mpi/f77/keyval_create_f.c
index 4565ae3c52..1e0787abac 100644
--- a/src/mpi/f77/keyval_create_f.c
+++ b/src/mpi/f77/keyval_create_f.c
@@ -56,17 +56,6 @@ void mpi_keyval_create_f(MPI_Fint *copy_attr_fn, MPI_Fint *delete_attr_fn,
     ompi_attribute_fn_ptr_union_t copy_fn;
     ompi_attribute_fn_ptr_union_t del_fn;
 
-    if (MPI_PARAM_CHECK) {
-        if ((NULL == copy_attr_fn)   || 
-            (NULL == delete_attr_fn) ||
-            (NULL == keyval)              ) {
-            c_err = OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD,
-                                           MPI_ERR_ARG,
-                                           FUNC_NAME);
-	    *ierr = OMPI_INT_2_FINT(c_err);
-        }
-    }
-
     copy_fn.attr_F_copy_fn = (MPI_F_copy_function *)copy_attr_fn;
     del_fn.attr_F_delete_fn = (MPI_F_delete_function *)delete_attr_fn;
 
diff --git a/src/mpi/f77/probe_f.c b/src/mpi/f77/probe_f.c
index 631cb217a5..7fb7c13385 100644
--- a/src/mpi/f77/probe_f.c
+++ b/src/mpi/f77/probe_f.c
@@ -11,6 +11,7 @@
 #include "mpi/f77/constants.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
+#include "mpi/runtime/params.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
 #pragma weak PMPI_PROBE = mpi_probe_f
diff --git a/src/mpi/f77/recv_f.c b/src/mpi/f77/recv_f.c
index 0b63e097cc..8bd3998767 100644
--- a/src/mpi/f77/recv_f.c
+++ b/src/mpi/f77/recv_f.c
@@ -11,6 +11,7 @@
 #include "mpi/f77/constants.h"
 #include "errhandler/errhandler.h"
 #include "communicator/communicator.h"
+#include "mpi/runtime/params.h"
 
 #if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
 #pragma weak PMPI_RECV = mpi_recv_f
diff --git a/src/mpi/f77/type_create_keyval_f.c b/src/mpi/f77/type_create_keyval_f.c
index 093505f92a..5efc9a310a 100644
--- a/src/mpi/f77/type_create_keyval_f.c
+++ b/src/mpi/f77/type_create_keyval_f.c
@@ -55,17 +55,6 @@ void mpi_type_create_keyval_f(MPI_Fint *type_copy_attr_fn, MPI_Fint *type_delete
     ompi_attribute_fn_ptr_union_t copy_fn;
     ompi_attribute_fn_ptr_union_t del_fn;
 
-    if (MPI_PARAM_CHECK) {
-        if ((NULL == type_copy_attr_fn)   || 
-            (NULL == type_delete_attr_fn) ||
-            (NULL == type_keyval)              ) {
-            c_err = OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD,
-                                           MPI_ERR_ARG,
-                                           FUNC_NAME);
-	    *ierr = OMPI_INT_2_FINT(c_err);
-        }
-    }
-
     copy_fn.attr_F_copy_fn = (MPI_F_copy_function *)type_copy_attr_fn;
     del_fn.attr_F_delete_fn = (MPI_F_delete_function *)type_delete_attr_fn;
 
diff --git a/src/mpi/f77/win_create_keyval_f.c b/src/mpi/f77/win_create_keyval_f.c
index c2ca455a50..3cfe2cce0f 100644
--- a/src/mpi/f77/win_create_keyval_f.c
+++ b/src/mpi/f77/win_create_keyval_f.c
@@ -55,16 +55,6 @@ void mpi_win_create_keyval_f(MPI_Fint *win_copy_attr_fn, MPI_Fint *win_delete_at
     ompi_attribute_fn_ptr_union_t copy_fn;
     ompi_attribute_fn_ptr_union_t del_fn;
 
-    if (MPI_PARAM_CHECK) {
-        if ((NULL == win_copy_attr_fn)   || 
-            (NULL == win_delete_attr_fn) ||
-            (NULL == win_keyval)            ) {
-            c_err = OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, 
-                                           MPI_ERR_ARG, 
-                                           FUNC_NAME);
-	    *ierr = OMPI_INT_2_FINT(c_err);
-        }
-    }
     copy_fn.attr_F_copy_fn = (MPI_F_copy_function *)win_copy_attr_fn;
     del_fn.attr_F_delete_fn = (MPI_F_delete_function *)win_delete_attr_fn;