diff --git a/configure b/configure
index ec5214f7e..e9d19037a 100755
--- a/configure
+++ b/configure
@@ -9,6 +9,7 @@ CC=${CC:-cc}
 CWARNFLAGS=${CWARNFLAGS:--Werror -Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition}
 CDEBUGFLAGS=${CDEBUGFLAGS:--std=gnu11 -g -fstack-protector}
 DEVELOPER=${DEVELOPER:-0}
+EXPERIMENTAL_FEATURES=${EXPERIMENTAL_FEATURES:-0}
 COMPAT=${COMPAT:-1}
 CONFIGURATOR_CC=${CONFIGURATOR_CC:-$CC}
 
@@ -47,7 +48,7 @@ usage()
     echo "    Prefix for make install"
     usage_with_default "--enable/disable-developer" "$DEVELOPER" "enable" "disable"
     echo "    Developer mode, good for testing"
-    usage_with_default "--enable/disable-experimental-features" "$EXPERIMENTAL_FEATURES" "enable" "disable (unless developer)"
+    usage_with_default "--enable/disable-experimental-features" "$EXPERIMENTAL_FEATURES" "enable" "disable"
     echo "    Developer mode, good for testing"
     usage_with_default "--enable/disable-compat" "$COMPAT" "enable" "disable"
     echo "    Compatibility mode, good to disable to see if your software breaks"
@@ -117,9 +118,6 @@ for opt in "$@"; do
     esac
 done
 
-# If EXPERIMENTAL_FEATURES not set, set it to same as DEVELOPER
-EXPERIMENTAL_FEATURES=${EXPERIMENTAL_FEATURES:-$DEVELOPER}
-
 echo -n "Compiling $CONFIGURATOR..."
 $CC $CWARNFLAGS $CDEBUGFLAGS -o $CONFIGURATOR $CONFIGURATOR.c
 echo "done"