1 files changed, 2 insertions, 8 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
index 2efdc21693..5ee730e022 100644
--- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
+++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java
@@ -508,14 +508,8 @@ public class ExecutionTool {
 
     // Plant the symlink forest.
     try {
-      SymlinkForest.builder()
-          .setLegacyExternalRunfiles(
-              request.getOptions(BuildConfiguration.Options.class).legacyExternalRunfiles)
-          .setPackageRoots(packageRoots)
-          .setWorkspace(getExecRoot())
-          .setProductName(runtime.getProductName())
-          .setWorkspaceName(workspaceName)
-          .build()
+      new SymlinkForest(
+          packageRoots, getExecRoot(), runtime.getProductName(), workspaceName)
           .plantSymlinkForest();
     } catch (IOException e) {
       throw new ExecutorInitException("Source forest creation failed", e);