diff --git a/src/mpi/f77/wtick_f.c b/src/mpi/f77/wtick_f.c
index 2cc9444229..435ddbb334 100644
--- a/src/mpi/f77/wtick_f.c
+++ b/src/mpi/f77/wtick_f.c
@@ -9,54 +9,31 @@
 #include "mpi.h"
 #include "mpi/f77/bindings.h"
 
-#if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
-#pragma weak PMPI_WTICK = mpi_wtick_f
-#pragma weak pmpi_wtick = mpi_wtick_f
-#pragma weak pmpi_wtick_ = mpi_wtick_f
-#pragma weak pmpi_wtick__ = mpi_wtick_f
-#elif OMPI_PROFILE_LAYER
-
-    double pmpi_wtick(void) {
-        return pmpi_wtick_f();
-    }
-
-    double pmpi_wtick_(void) {
-        return pmpi_wtick_f();
-    }
-
-    double pmpi_wtick__(void) {
-        return pmpi_wtick_f();
-    }
-
-    double PMPI_WTICK(void) {
-        return pmpi_wtick_f();
-    }
-
-#endif
-
+/* As the standard allow us to define this function as a macro, it cannot
+ * have a profiling interface.
+ */
 #if OMPI_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_WTICK = mpi_wtick_f
 #pragma weak mpi_wtick = mpi_wtick_f
 #pragma weak mpi_wtick_ = mpi_wtick_f
 #pragma weak mpi_wtick__ = mpi_wtick_f
-#endif
 
-#if ! OMPI_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER
+#else
 
     double mpi_wtick(void) {
-        return mpi_wtick_f();
+        return MPI_Wtick();
     }
 
     double mpi_wtick_(void) {
-        return mpi_wtick_f();
+        return MPI_Wtick();
     }
 
     double mpi_wtick__(void) {
-        return mpi_wtick_f();
+        return MPI_Wtick();
     }
 
     double MPI_WTICK(void) {
-        return mpi_wtick_f();
+        return MPI_Wtick();
     }
 
 #endif
diff --git a/src/mpi/f77/wtime_f.c b/src/mpi/f77/wtime_f.c
index f2522e20f0..6f453599b9 100644
--- a/src/mpi/f77/wtime_f.c
+++ b/src/mpi/f77/wtime_f.c
@@ -9,54 +9,31 @@
 #include "mpi.h"
 #include "mpi/f77/bindings.h"
 
-#if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILE_LAYER
-#pragma weak PMPI_WTIME = mpi_wtime_f
-#pragma weak pmpi_wtime = mpi_wtime_f
-#pragma weak pmpi_wtime_ = mpi_wtime_f
-#pragma weak pmpi_wtime__ = mpi_wtime_f
-#elif OMPI_PROFILE_LAYER
-
-    double pmpi_wtime(void) {
-        return pmpi_wtime_f();
-    }
-
-    double pmpi_wtime_(void) {
-        return pmpi_wtime_f();
-    }
-
-    double pmpi_wtime__(void) {
-        return pmpi_wtime_f();
-    }
-
-    double PMPI_WTIME(void) {
-        return pmpi_wtime_f();
-    }
-
-#endif
-
+/* As the standard allow us to implement this function as a macro
+ * we cannot have profiling interface.
+ */
 #if OMPI_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_WTIME = mpi_wtime_f
 #pragma weak mpi_wtime = mpi_wtime_f
 #pragma weak mpi_wtime_ = mpi_wtime_f
 #pragma weak mpi_wtime__ = mpi_wtime_f
-#endif
 
-#if ! OMPI_HAVE_WEAK_SYMBOLS && ! OMPI_PROFILE_LAYER
+#else
 
     double mpi_wtime(void) {
-        return mpi_wtime_f();
+        return MPI_Wtime();
     }
 
     double mpi_wtime_(void) {
-        return mpi_wtime_f();
+        return MPI_Wtime();
     }
 
     double mpi_wtime__(void) {
-        return mpi_wtime_f();
+        return MPI_Wtime();
     }
 
     double MPI_WTIME(void) {
-        return mpi_wtime_f();
+        return MPI_Wtime();
     }
 
 #endif