diff --git a/base/src/com/google/idea/blaze/base/sync/workspace/WorkspaceHelper.java b/base/src/com/google/idea/blaze/base/sync/workspace/WorkspaceHelper.java
index b60120a143d..f28d6cbfe3f 100644
--- a/base/src/com/google/idea/blaze/base/sync/workspace/WorkspaceHelper.java
+++ b/base/src/com/google/idea/blaze/base/sync/workspace/WorkspaceHelper.java
@@ -211,7 +211,7 @@ private static synchronized WorkspaceRoot getExternalWorkspaceRootsFile(String w
       return workspaceRootCache.get(workspaceName);
     }
 
-    BlazeProjectData blazeProjectData = getBlazeProjectData(project);
+    BlazeProjectData blazeProjectData = BlazeProjectDataManager.getInstance(project).getBlazeProjectData();
     if (blazeProjectData != null) {
       logger.warn("getExternalWorkspaceRootsFile: " + blazeProjectData.getBlazeInfo().getOutputBase());
       File workspaceDir = new File(blazeProjectData.getBlazeInfo().getOutputBase(), "external/" + workspaceName);
diff --git a/base/tests/utils/unit/com/google/idea/blaze/base/model/MockBlazeProjectDataBuilder.java b/base/tests/utils/unit/com/google/idea/blaze/base/model/MockBlazeProjectDataBuilder.java
index 1d226a61060..08718043b1f 100644
--- a/base/tests/utils/unit/com/google/idea/blaze/base/model/MockBlazeProjectDataBuilder.java
+++ b/base/tests/utils/unit/com/google/idea/blaze/base/model/MockBlazeProjectDataBuilder.java
@@ -107,7 +107,8 @@ public MockBlazeProjectDataBuilder setWorkspaceLanguageSettings(
   }
 
   @CanIgnoreReturnValue
-  public MockBlazeProjectDataBuilder setExternalWorkspaceData(ExternalWorkspaceData externalWorkspaceData) {
+  public MockBlazeProjectDataBuilder setExternalWorkspaceData(
+      ExternalWorkspaceData externalWorkspaceData) {
     this.externalWorkspaceData = externalWorkspaceData;
     return this;
   }