diff --git a/src/mapi/entry.c b/src/mapi/entry.c
index 315829eb30b..7ff3c8f8c8c 100644
--- a/src/mapi/entry.c
+++ b/src/mapi/entry.c
@@ -67,7 +67,7 @@ entry_current_get(void)
 #ifdef MAPI_MODE_BRIDGE
    return GET_DISPATCH();
 #else
-   return u_current_get_table();
+   return u_current_get_table_internal();
 #endif
 }
 
diff --git a/src/mapi/u_current.h b/src/mapi/u_current.h
index 8f7d222b976..e7faa878ed1 100644
--- a/src/mapi/u_current.h
+++ b/src/mapi/u_current.h
@@ -62,15 +62,4 @@ u_current_set_context(const void *ptr);
 void *
 u_current_get_context_internal(void);
 
-static inline const struct _glapi_table *
-u_current_get_table(void)
-{
-#ifdef USE_ELF_TLS
-   return u_current_table;
-#else
-   return (likely(u_current_table) ?
-         u_current_table : u_current_get_table_internal());
-#endif
-}
-
 #endif /* _U_CURRENT_H_ */