diff --git a/hat/hat/job.jar b/hat/hat/job.jar
index d81376304b1..0de0b4450cb 100644
Binary files a/hat/hat/job.jar and b/hat/hat/job.jar differ
diff --git a/hat/hat/job/src/main/java/job/Jar.java b/hat/hat/job/src/main/java/job/Jar.java
index 8857c49c854..d79cb6aefe0 100644
--- a/hat/hat/job/src/main/java/job/Jar.java
+++ b/hat/hat/job/src/main/java/job/Jar.java
@@ -120,7 +120,6 @@ public boolean build() {
                         "--source=26",
                         "--enable-preview",
                         "--add-modules=jdk.incubator.code",
-                        "--add-exports=jdk.incubator.code/jdk.incubator.code.dialect.java.impl=ALL-UNNAMED",
                         "-g",
                         "-d", classesDirName()
                 ));
@@ -281,7 +280,7 @@ public boolean run(String mainClassName, Set<Dependency> depsInOrder, List<Strin
                 "--enable-native-access=ALL-UNNAMED"
         );
         opts.add(
-                "--add-exports=jdk.incubator.code/jdk.incubator.code.dialect.java.impl=ALL-UNNAMED", // for OpRenderer
+                "--add-modules=jdk.incubator.code",
                 "--class-path", classPathWithThisLast(depsInOrder),
                 "-Djava.library.path=" + id().project().buildPath()
         );
diff --git a/hat/hat/run.java b/hat/hat/run.java
index eacbdbb6c4f..a2fd2c34cd4 100644
--- a/hat/hat/run.java
+++ b/hat/hat/run.java
@@ -175,6 +175,7 @@ class name is assumed to be package.Main  (i.e. mandel.main)
               .enable_preview()
               .verbose(true)
               .enable_native_access("ALL-UNNAMED")
+              .add_modules("jdk.incubator.code")
               .library_path(buildDir)
               .when(config.headless, Script.JavaBuilder::headless)
               .when(config.startOnFirstThread, Script.JavaBuilder::start_on_first_thread)
diff --git a/hat/hat/test.java b/hat/hat/test.java
index 97d6bc19195..5dadfe26288 100644
--- a/hat/hat/test.java
+++ b/hat/hat/test.java
@@ -189,6 +189,7 @@ void main(String[] argv) {
                     .enable_preview()
                     .verbose(true)
                     .enable_native_access("ALL-UNNAMED")
+                    .add_modules("jdk.incubator.code")
                     .library_path(buildDir)
                     .when(config.headless, Script.JavaBuilder::headless)
                     .when(config.startOnFirstThread, Script.JavaBuilder::start_on_first_thread)
@@ -233,6 +234,7 @@ void main(String[] argv) {
                 .enable_preview()
                 .verbose(true)
                 .enable_native_access("ALL-UNNAMED")
+                .add_modules("jdk.incubator.code")
                 .library_path(buildDir)
                 .when(config.headless, Script.JavaBuilder::headless)
                 .when(config.startOnFirstThread, Script.JavaBuilder::start_on_first_thread)