diff --git a/configure.ac b/configure.ac
index 4168b02bee..16326505a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -545,12 +545,6 @@ fi
 AC_SUBST(EINA_CONFIGURE_HAVE_DEBUG_THREADS)
 AM_CONDITIONAL([EINA_DEBUG_THREADS], [test "x${efl_have_debug_threads}" = "xyes"])
 
-if ! test "x${efl_have_on_off_threads}" = "xno"; then
-   EINA_CONFIGURE_HAVE_ON_OFF_THREADS="#define EINA_HAVE_ON_OFF_THREADS"
-fi
-AC_SUBST(EINA_CONFIGURE_HAVE_ON_OFF_THREADS)
-AM_CONDITIONAL([EINA_ON_OFF_THREADS], [! test "x${efl_have_on_off_threads}" = "xno"])
-
 ### Modules
 EINA_CHECK_MODULE([chained-pool],   [static], [chained pool])
 EINA_CHECK_MODULE([pass-through],   [static], [pass through])
@@ -873,7 +867,6 @@ echo "  Thread Support.......: ${efl_have_threads}"
 if test "${efl_have_threads}" = "POSIX" ; then
 echo "    spinlock...........: ${efl_have_posix_threads_spinlock}"
 echo "    debug usage........: ${efl_have_debug_threads}"
-echo "    on/off support.....: ${efl_have_on_off_threads}"
 fi
 echo
 echo "Compilation............: make (or gmake)"
diff --git a/m4/efl_threads.m4 b/m4/efl_threads.m4
index e3dafa0a06..b789874c0a 100644
--- a/m4/efl_threads.m4
+++ b/m4/efl_threads.m4
@@ -117,21 +117,6 @@ if test "x${efl_have_posix_threads_spinlock}" = "xyes" ; then
    AC_DEFINE([EFL_HAVE_POSIX_THREADS_SPINLOCK], [1], [Define to mention that POSIX threads spinlocks are supported])
 fi
 
-dnl Check ON-OFF threads
-
-_efl_enable_on_off_threads="no"
-AC_ARG_ENABLE([on-off-threads],
-   [AC_HELP_STRING([--enable-on-off-threads], [only turn this on if you know what you are doing, and do not complain if the world freeze])],
-   [_efl_enable_on_off_threads="${enableval}"])
-
-efl_have_on_off_threads="no"
-if test "x${_efl_have_posix_threads}" = "xyes" && test "x${_efl_enable_on_off_threads}" = "xyes"; then
-   efl_have_on_off_threads="yes"
-   AC_DEFINE([EFL_ON_OFF_THREADS], [1], [make it possible to disable all locks])
-fi
-AC_MSG_CHECKING([whether to turn on/off threads lock on demand])
-AC_MSG_RESULT([${efl_have_on_off_threads}])
-
 dnl Check debug threads
 
 _efl_enable_debug_threads="no"
diff --git a/src/lib/eina/eina_config.h.in b/src/lib/eina/eina_config.h.in
index 937d208208..1f7bb31ac2 100644
--- a/src/lib/eina/eina_config.h.in
+++ b/src/lib/eina/eina_config.h.in
@@ -68,11 +68,6 @@
 #endif
 #define EINA_SIZEOF_WCHAR_T @EINA_SIZEOF_WCHAR_T@
 
-#ifdef EINA_HAVE_ON_OFF_THREADS
-# undef EINA_HAVE_ON_OFF_THREADS
-#endif
-@EINA_CONFIGURE_HAVE_ON_OFF_THREADS@
-
 #ifdef EINA_CONFIGURE_HAVE_DIRENT_H
 # undef EINA_CONFIGURE_HAVE_DIRENT_H
 #endif