diff -r fc363a3b690a -r 678e1c9eb009 lib/Tools/java
--- a/lib/Tools/java	Thu Jul 15 16:35:45 2021 +0200
+++ b/lib/Tools/java	Thu Jul 15 17:33:06 2021 +0200
@@ -6,7 +6,8 @@
 
 eval "declare -a JAVA_ARGS=($ISABELLE_JAVA_SYSTEM_OPTIONS)"
 
-isabelle_setup_classpath
+classpath "$ISABELLE_SETUP_CLASSPATH"
+unset ISABELLE_SETUP_CLASSPATH
 
 [ -n "$CLASSPATH" ] && classpath "$CLASSPATH"
 unset CLASSPATH