diff -r c13198575f75 -r b4f57bfe82e7 lib/Tools/java
--- a/lib/Tools/java	Sat Jul 17 23:09:54 2021 +0200
+++ b/lib/Tools/java	Sun Jul 18 12:48:31 2021 +0200
@@ -6,11 +6,7 @@
 
 eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
 
-if [ -z "$ISABELLE_SETUP_CLASSPATH_SKIP" -o "$ISABELLE_SETUP_CLASSPATH_SKIP" = "false" ]
-then
-  classpath "$ISABELLE_SETUP_CLASSPATH"; unset ISABELLE_SETUP_CLASSPATH
-fi
-
+classpath "$ISABELLE_SETUP_CLASSPATH"; unset ISABELLE_SETUP_CLASSPATH
 classpath "$CLASSPATH"; unset CLASSPATH
 
 isabelle_java java "${JAVA_ARGS[@]}" \