2 files changed, 3 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java
index 5e16483f6a..6d7c4f8886 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java
@@ -110,6 +110,7 @@ public class BazelRepositoryModule extends BlazeModule {
     for (RepositoryFunction handler : repositoryHandlers.values()) {
       handler.setDirectories(directories);
     }
+    skylarkRepositoryFunction.setDirectories(directories);
   }
 
   /**
diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
index c5cd01ef05..8c66b96469 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
@@ -123,15 +123,12 @@ public class RepositoryDelegatorFunction implements SkyFunction {
     if (markerUpToDate && repoRoot.exists()) {
       // Now that we know that it exists, we can declare a Skyframe dependency on the repository
       // root.
-      FileValue repoRootValue = RepositoryFunction.getRepositoryDirectory(repoRoot, env);
+      RepositoryFunction.getRepositoryDirectory(repoRoot, env);
       if (env.valuesMissing()) {
         return null;
       }
 
-      // NB: This returns the wrong repository value for non-local new_* repository functions.
-      // This should sort itself out automatically once the ExternalFilesHelper refactoring is
-      // finally submitted.
-      return RepositoryDirectoryValue.create(repoRootValue.realRootedPath().asPath());
+      return RepositoryDirectoryValue.create(repoRoot);
     }
 
     if (isFetch.get()) {