diff --git a/control/descriptor.c b/control/descriptor.c
index 7aed898158cea77c40df39b58ad84150d9df05a7..8c054d98d43b96f9e15c864452c933d3eec00762 100644
--- a/control/descriptor.c
+++ b/control/descriptor.c
@@ -943,29 +943,6 @@ int CHAMELEON_Desc_Flush( const CHAM_desc_t        *desc,
     return CHAMELEON_SUCCESS;
 }
 
-/**
- *****************************************************************************
- *
- * @ingroup Descriptor
- *
- *  CHAMELEON_user_tag_size - Set the sizes for the MPI tags
- *  Default value: tag_width=31, tag_sep=24, meaning that the MPI tag is stored
- *  in 31 bits, with 24 bits for the tile tag and 7 for the descriptor.  This
- *  function must be called before any descriptor creation.
- *
- ******************************************************************************
- *
- * @param[in] user_tag_width
- *          The new value for tag_width.
- *
- * @param[in] user_tag_sep
- *          The new value for tag_sep.
- *
- */
-void CHAMELEON_user_tag_size(int user_tag_width, int user_tag_sep) {
-    return;
-}
-
 static void
 chameleon_desc_print( const CHAM_desc_t *desc, int shift )
 {
diff --git a/doc/user/chapters/using.org b/doc/user/chapters/using.org
index 0e729276989f8c1cb67049fe6102ea2145e8530f..18c2f1e74414368f72f1ad72eb5e9dce90dea93f 100644
--- a/doc/user/chapters/using.org
+++ b/doc/user/chapters/using.org
@@ -1050,14 +1050,6 @@
      int CHAMELEON_Desc_Flush(CHAM_desc_t  *desc, RUNTIME_sequence_t *sequence);
      #+end_src
 
-     Set the sizes for the MPI tags.  Default value: tag_width=31,
-     tag_sep=24, meaning that the MPI tag is stored in 31 bits, with
-     24 bits for the tile tag and 7 for the descriptor.  This function
-     must be called before any descriptor creation.
-     #+begin_src
-     void CHAMELEON_user_tag_size(int user_tag_width, int user_tag_sep);
-     #+end_src
-
 **** Sequences routines
 
      Create a sequence.
diff --git a/include/chameleon.h b/include/chameleon.h
index c0a9ea9a9f6896be35a78ffab0b2e264c2bf6772..8c3669af397ac25e53bdbd55c33feced0947a48e 100644
--- a/include/chameleon.h
+++ b/include/chameleon.h
@@ -161,7 +161,13 @@ int  CHAMELEON_Disable (int option);
 int  CHAMELEON_Set     (int param, int  value);
 int  CHAMELEON_Get     (int param, int *value);
 int  CHAMELEON_Set_update_progress_callback(void (*p)(int, int)) ;
-void CHAMELEON_user_tag_size(int, int);
+
+static inline void CHAMELEON_user_tag_size(int, int)  __attribute__((deprecated("This function is no longer needed")));;
+static inline void CHAMELEON_user_tag_size(int user_tag_width, int user_tag_sep) {
+    (void)user_tag_width;
+    (void)user_tag_sep;
+    return;
+}
 
 /* Sequences */
 int CHAMELEON_Sequence_Create  (RUNTIME_sequence_t **sequence);
diff --git a/testing/test_fembem b/testing/test_fembem
index 1e9813068d15dbc570d16da086151e66dc670975..906d73c7abb0821e8df787f05fab2d503a2e76ff 160000
--- a/testing/test_fembem
+++ b/testing/test_fembem
@@ -1 +1 @@
-Subproject commit 1e9813068d15dbc570d16da086151e66dc670975
+Subproject commit 906d73c7abb0821e8df787f05fab2d503a2e76ff