diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RedirectChaser.java b/src/main/java/com/google/devtools/build/lib/analysis/RedirectChaser.java
deleted file mode 100644
index 22c1fbc842b153..00000000000000
--- a/src/main/java/com/google/devtools/build/lib/analysis/RedirectChaser.java
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2014 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.devtools.build.lib.analysis;
-
-import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment;
-import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
-import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.packages.AbstractAttributeMapper;
-import com.google.devtools.build.lib.packages.BuildType;
-import com.google.devtools.build.lib.packages.NoSuchThingException;
-import com.google.devtools.build.lib.packages.Rule;
-import com.google.devtools.build.lib.packages.Target;
-import com.google.devtools.build.lib.syntax.Type;
-import java.util.HashSet;
-import java.util.Set;
-import javax.annotation.Nullable;
-
-/**
- * Tool for chasing redirects. This is intended to be used during configuration creation.
- */
-public final class RedirectChaser {
-
-  /**
-   * Custom attribute mapper that throws an exception if an attribute's value depends on the
-   * build configuration.
-   */
-  private static class StaticValuedAttributeMapper extends AbstractAttributeMapper {
-    public StaticValuedAttributeMapper(Rule rule) {
-      super(rule.getPackage(), rule.getRuleClassObject(), rule.getLabel(),
-          rule.getAttributeContainer());
-    }
-
-    /**
-     * Returns the value of the given attribute.
-     *
-     * @throws InvalidConfigurationException if the value is configuration-dependent
-     */
-    public <T> T getAndValidate(String attributeName, Type<T> type)
-        throws InvalidConfigurationException {
-      if (getSelectorList(attributeName, type) != null) {
-        throw new InvalidConfigurationException
-            ("The value of '" + attributeName + "' cannot be configuration-dependent");
-      }
-      return super.get(attributeName, type);
-    }
-  }
-
-  /**
-   * Follows the 'srcs' attribute of the given label recursively. Keeps repeating as long as the
-   * labels are either <code>alias</code> or <code>bind</code> rules.
-   *
-   * @param env for loading the packages
-   * @param label the label to start at
-   * @param name user-meaningful description of the content being resolved
-   * @return the label which cannot be further resolved
-   * @throws InvalidConfigurationException if something goes wrong
-   */
-  @Nullable
-  public static Label followRedirects(ConfigurationEnvironment env, Label label, String name)
-      throws InvalidConfigurationException, InterruptedException {
-    Label oldLabel = null;
-    Set<Label> visitedLabels = new HashSet<>();
-    visitedLabels.add(label);
-    try {
-      while (true) {
-        Target possibleRedirect = env.getTarget(label);
-        if (possibleRedirect == null) {
-          return null;
-        }
-        Label newLabel = getBindOrAliasRedirect(possibleRedirect);
-        if (newLabel == null) {
-          return label;
-        }
-
-        newLabel = label.resolveRepositoryRelative(newLabel);
-        oldLabel = label;
-        label = newLabel;
-        if (!visitedLabels.add(label)) {
-          throw new InvalidConfigurationException("The " + name + " points to a rule which "
-              + "recursively references itself. The label " + label + " is part of the loop");
-        }
-      }
-    } catch (NoSuchThingException e) {
-      String prefix = oldLabel == null
-          ? ""
-          : "in target '" + oldLabel + "': ";
-      throw new InvalidConfigurationException(prefix + e.getMessage(), e);
-    }
-  }
-
-  private static Label getBindOrAliasRedirect(Target target)
-      throws InvalidConfigurationException {
-    if (!(target instanceof Rule)) {
-      return null;
-    }
-
-    Rule rule = (Rule) target;
-    if (!rule.getRuleClass().equals("bind") && !rule.getRuleClass().equals("alias")) {
-      return null;
-    }
-
-    return new StaticValuedAttributeMapper(rule).getAndValidate("actual", BuildType.LABEL);
-  }
-}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationEnvironment.java
deleted file mode 100644
index 7947e5e7169771..00000000000000
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationEnvironment.java
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2014 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.devtools.build.lib.analysis.config;
-
-import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.events.ExtendedEventHandler;
-import com.google.devtools.build.lib.packages.NoSuchPackageException;
-import com.google.devtools.build.lib.packages.NoSuchTargetException;
-import com.google.devtools.build.lib.packages.Package;
-import com.google.devtools.build.lib.packages.Target;
-import com.google.devtools.build.lib.pkgcache.LoadedPackageProvider;
-import com.google.devtools.build.lib.pkgcache.PackageProvider;
-import com.google.devtools.build.lib.vfs.Path;
-
-/**
- * An environment to support creating BuildConfiguration instances in a hermetic fashion; all
- * accesses to packages or the file system <b>must</b> go through this interface, so that they can
- * be recorded for correct caching.
- */
-public interface ConfigurationEnvironment {
-  /**
-   * Returns a target for the given label, loading it if necessary, and throwing an exception if it
-   * does not exist.
-   *
-   * @deprecated Do not use this method. Configuration fragments should be fairly dumb key-value
-   * maps so that they are cheap and easy to create.
-   *
-   * <p>If you feel the need to use contents of BUILD files in your
-   * {@link ConfigurationFragmentFactory}, add an implicit dependency to your rules that use your
-   * configuration fragment that point to a rule of a new rule class, and do the computation during
-   * the analysis of said rule. The only uses of this method are those we haven't gotten around
-   * migrating yet.
-   */
-  @Deprecated
-  Target getTarget(Label label)
-      throws NoSuchPackageException, NoSuchTargetException, InterruptedException;
-
-  /**
-   * Returns a path for the given file within the given package.
-   *
-   * @deprecated Do not use this method. Configuration fragments should be fairly dumb key-value
-   * maps so that they are cheap and easy to create. If you feel the need to read contents of files
-   * in your {@link ConfigurationFragmentFactory}, you have the following options:
-   * <ul>
-   *   <li>
-   *     Add an implicit dependency to the rules that need this configuration fragment, put the
-   *     information you need in BUILD files and use it during the analysis of the implicit
-   *     dependency
-   *   </li>
-   *   <li>
-   *     Read the file during the execution phase (then it won't be able to affect analysis)
-   *   </li>
-   *   <li>
-   *     Contact the developers of Bazel and we'll figure something out.
-   *   </li>
-   * </ul>
-   */
-  @Deprecated
-  Path getPath(Package pkg, String fileName) throws InterruptedException;
-  /**
-   * An implementation backed by a {@link PackageProvider} instance.
-   */
-  public static final class TargetProviderEnvironment implements ConfigurationEnvironment {
-    private final LoadedPackageProvider packageProvider;
-
-    public TargetProviderEnvironment(
-        PackageProvider packageProvider, ExtendedEventHandler eventHandler) {
-      this.packageProvider = new LoadedPackageProvider(packageProvider, eventHandler);
-    }
-
-    @Override
-    public Target getTarget(final Label label)
-        throws NoSuchPackageException, NoSuchTargetException, InterruptedException {
-      return packageProvider.getLoadedTarget(label);
-    }
-
-    @Override
-    public Path getPath(Package pkg, String fileName) {
-      return pkg.getPackageDirectory().getRelative(fileName);
-    }
-  }
-}
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationFragmentFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationFragmentFactory.java
index 2d72a8be2c58d4..23383db4db7ec4 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationFragmentFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/ConfigurationFragmentFactory.java
@@ -15,7 +15,6 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment;
-import javax.annotation.Nullable;
 
 /**
  * A factory that creates configuration fragments.
@@ -24,40 +23,11 @@ public interface ConfigurationFragmentFactory {
   /**
    * Creates a configuration fragment.
    *
-   * <p>All implementations should override this method unless they have a really good reason
-   * to override {@link #create(ConfigurationEnvironment, BuildOptions)} instead. The latter
-   * interface is slated for removal once we detach legacy callers.
-   *
    * @param buildOptions command-line options (see {@link FragmentOptions})
    * @return the configuration fragment or null if some required dependencies are missing.
    */
-  @Nullable
-  default BuildConfiguration.Fragment create(BuildOptions buildOptions)
-      throws InvalidConfigurationException, InterruptedException {
-    throw new IllegalStateException(
-        "One of this method's signatures must be overridden to have a valid fragment creator");
-  }
-
-  /**
-   * Creates a configuration fragment: <b>LEGACY VERSION</b>.
-   *
-   * <p>For implementations that cannot override {@link #create(BuildOptions)} because they really
-   * need access to {@link ConfigurationEnvironment}. {@link ConfigurationEnvironment} adds extra
-   * dependencies to fragment creation that makes the whole process more complicated and delicate.
-   * We're also working on Bazel enhancements that will make current calls unnecessary. So this
-   * version really only exists as a stopgap before we can migrate away the legacy calls.
-   *
-   * @param env the ConfigurationEnvironment for querying targets and paths
-   * @param buildOptions command-line options (see {@link FragmentOptions})
-   * @return the configuration fragment or null if some required dependencies are missing.
-   */
-  @Deprecated
-  @Nullable
-  default BuildConfiguration.Fragment create(ConfigurationEnvironment env,
-      BuildOptions buildOptions) throws InvalidConfigurationException, InterruptedException {
-    return create(buildOptions);
-  }
-
+  BuildConfiguration.Fragment create(BuildOptions buildOptions)
+      throws InvalidConfigurationException;
 
   /**
    * @return the exact type of the fragment this factory creates.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/PackageProviderForConfigurations.java b/src/main/java/com/google/devtools/build/lib/analysis/config/PackageProviderForConfigurations.java
deleted file mode 100644
index 9b6a84cb3822ed..00000000000000
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/PackageProviderForConfigurations.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2014 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package com.google.devtools.build.lib.analysis.config;
-
-import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
-import com.google.devtools.build.lib.events.ExtendedEventHandler;
-import com.google.devtools.build.lib.packages.NoSuchPackageException;
-import com.google.devtools.build.lib.packages.NoSuchTargetException;
-import com.google.devtools.build.lib.packages.Package;
-import com.google.devtools.build.lib.packages.Target;
-import java.io.IOException;
-
-/**
- * A variant of PackageProvider which is used during a creation of BuildConfiguration.Fragments.
- */
-public interface PackageProviderForConfigurations {
-  ExtendedEventHandler getEventHandler();
-
-  /**
-   * Adds dependency to fileName if needed. Used only in skyframe, for creating correct dependencies
-   * for {@link com.google.devtools.build.lib.skyframe.ConfigurationFragmentValue}.
-   */
-  void addDependency(Package pkg, String fileName)
-      throws LabelSyntaxException, IOException, InterruptedException;
-  
-  /**
-   * Returns true if any dependency is missing (value of some node hasn't been evaluated yet).
-   */
-  boolean valuesMissing();
-
-  /**
-   * Returns the Target identified by "label", loading, parsing and evaluating the package if it is
-   * not already loaded. May return {@code null} if the corresponding Skyframe entry requires
-   * function evaluation.
-   *
-   * @throws NoSuchPackageException if the package could not be found
-   * @throws NoSuchTargetException if the package was loaded successfully, but the specified {@link
-   *     Target} was not found in it
-   */
-  Target getTarget(Label label)
-      throws NoSuchPackageException, NoSuchTargetException, InterruptedException;
-}
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
index b89952606954d8..3a060f671c4ac1 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfiguration.java
@@ -144,7 +144,6 @@ public String toString() {
   // verify that the two are the same, we can remove one of desiredCpu and targetCpu.
   private final String desiredCpu;
 
-  private final Label redirectChasedCrosstoolTop;
   private final PathFragment fdoPath;
   private final Label fdoOptimizeLabel;
 
@@ -163,8 +162,7 @@ public String toString() {
   private final boolean stripBinaries;
   private final CompilationMode compilationMode;
 
-  static CppConfiguration create(
-      CpuTransformer cpuTransformer, Label redirectChasedCrosstoolTop, BuildOptions options)
+  static CppConfiguration create(CpuTransformer cpuTransformer, BuildOptions options)
       throws InvalidConfigurationException {
     CppOptions cppOptions = options.get(CppOptions.class);
 
@@ -199,7 +197,6 @@ static CppConfiguration create(
 
     return new CppConfiguration(
         cpuTransformer.getTransformer().apply(commonOptions.cpu),
-        redirectChasedCrosstoolTop,
         Preconditions.checkNotNull(commonOptions.cpu),
         fdoPath,
         fdoProfileLabel,
@@ -218,7 +215,6 @@ static CppConfiguration create(
 
   private CppConfiguration(
       String transformedCpuFromOptions,
-      Label redirectChasedCrosstoolTop,
       String desiredCpu,
       PathFragment fdoPath,
       Label fdoOptimizeLabel,
@@ -232,7 +228,6 @@ private CppConfiguration(
       boolean stripBinaries,
       CompilationMode compilationMode) {
     this.transformedCpuFromOptions = transformedCpuFromOptions;
-    this.redirectChasedCrosstoolTop = redirectChasedCrosstoolTop;
     this.desiredCpu = desiredCpu;
     this.fdoPath = fdoPath;
     this.fdoOptimizeLabel = fdoOptimizeLabel;
@@ -254,7 +249,7 @@ private CppConfiguration(
       defaultLabel = "//tools/cpp:crosstool",
       defaultInToolRepository = true)
   public Label getRuleProvidingCcToolchainProvider() {
-    return redirectChasedCrosstoolTop;
+    return cppOptions.crosstoolTop;
   }
 
   /**
@@ -571,10 +566,6 @@ boolean enableCcToolchainConfigInfoFromSkylark() {
     return cppOptions.enableCcToolchainConfigInfoFromSkylark;
   }
 
-  public Label getCrosstoolTop() {
-    return cppOptions.crosstoolTop;
-  }
-
   /**
    * Returns the value of the libc top-level directory (--grte_top) as specified on the command line
    */
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
index 981f11c8c40423..7a38bc248b39c8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppConfigurationLoader.java
@@ -15,14 +15,11 @@
 package com.google.devtools.build.lib.rules.cpp;
 
 import com.google.common.collect.ImmutableSet;
-import com.google.devtools.build.lib.analysis.RedirectChaser;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
-import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment;
 import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory;
 import com.google.devtools.build.lib.analysis.config.FragmentOptions;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
-import com.google.devtools.build.lib.cmdline.Label;
 
 /**
  * Loader for C++ configurations.
@@ -49,18 +46,7 @@ public CppConfigurationLoader(CpuTransformer cpuTransformer) {
   }
 
   @Override
-  public CppConfiguration create(ConfigurationEnvironment env, BuildOptions options)
-      throws InvalidConfigurationException, InterruptedException {
-    CppOptions cppOptions = options.get(CppOptions.class);
-    // To be deleted soon, keeping there only to split a change removing package loading from
-    // CppConfiguration into 2, one is user invisible, second one is user visible (redirect chaser
-    // doesn't respect visibility, so after removal it can happen that what used to load will
-    // not load anymore.
-    Label crosstoolTopLabel =
-        RedirectChaser.followRedirects(env, cppOptions.crosstoolTop, "crosstool_top");
-    if (crosstoolTopLabel == null) {
-      return null;
-    }
-    return CppConfiguration.create(cpuTransformer, crosstoolTopLabel, options);
+  public CppConfiguration create(BuildOptions options) throws InvalidConfigurationException {
+    return CppConfiguration.create(cpuTransformer, options);
   }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentFunction.java
index 32aaee7760addd..820539decb0b82 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfigurationFragmentFunction.java
@@ -17,23 +17,13 @@
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration.Fragment;
 import com.google.devtools.build.lib.analysis.config.BuildOptions;
-import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment;
 import com.google.devtools.build.lib.analysis.config.ConfigurationFragmentFactory;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
-import com.google.devtools.build.lib.analysis.config.PackageProviderForConfigurations;
-import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
-import com.google.devtools.build.lib.packages.NoSuchPackageException;
-import com.google.devtools.build.lib.packages.NoSuchTargetException;
-import com.google.devtools.build.lib.packages.Package;
-import com.google.devtools.build.lib.packages.Target;
 import com.google.devtools.build.lib.skyframe.ConfigurationFragmentValue.ConfigurationFragmentKey;
-import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.skyframe.SkyFunction;
 import com.google.devtools.build.skyframe.SkyFunctionException;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
-import java.io.IOException;
 
 /**
  * A builder for {@link ConfigurationFragmentValue}s.
@@ -48,16 +38,13 @@ public ConfigurationFragmentFunction(
 
   @Override
   public SkyValue compute(SkyKey skyKey, Environment env)
-      throws ConfigurationFragmentFunctionException, InterruptedException {
+      throws ConfigurationFragmentFunctionException {
     ConfigurationFragmentKey configurationFragmentKey = 
         (ConfigurationFragmentKey) skyKey.argument();
     BuildOptions buildOptions = configurationFragmentKey.getBuildOptions();
     ConfigurationFragmentFactory factory = getFactory(configurationFragmentKey.getFragmentType());
     try {
-      PackageProviderForConfigurations packageProvider =
-          new SkyframePackageLoaderWithValueEnvironment(env);
-      ConfigurationEnvironment confEnv = new ConfigurationBuilderEnvironment(packageProvider);
-      Fragment fragment = factory.create(confEnv, buildOptions);
+      Fragment fragment = factory.create(buildOptions);
 
       if (env.valuesMissing()) {
         return null;
@@ -88,32 +75,6 @@ public String extractTag(SkyKey skyKey) {
     return null;
   }
 
-  /** A {@link ConfigurationEnvironment} implementation that can create dependencies on files. */
-  private static final class ConfigurationBuilderEnvironment implements ConfigurationEnvironment {
-    private final PackageProviderForConfigurations packageProvider;
-
-    ConfigurationBuilderEnvironment(PackageProviderForConfigurations packageProvider) {
-      this.packageProvider = packageProvider;
-    }
-
-    @Override
-    public Target getTarget(Label label)
-        throws NoSuchPackageException, NoSuchTargetException, InterruptedException {
-      return packageProvider.getTarget(label);
-    }
-
-    @Override
-    public Path getPath(Package pkg, String fileName) throws InterruptedException {
-      Path result = pkg.getPackageDirectory().getRelative(fileName);
-      try {
-        packageProvider.addDependency(pkg, fileName);
-      } catch (IOException | LabelSyntaxException e) {
-        return null;
-      }
-      return result;
-    }
-  }
-
   /**
    * Used to declare all the exception types that can be wrapped in the exception thrown by
    * {@link ConfigurationFragmentFunction#compute}.
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java
deleted file mode 100644
index abd6cd42e74f8e..00000000000000
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframePackageLoaderWithValueEnvironment.java
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2014 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package com.google.devtools.build.lib.skyframe;
-
-import com.google.devtools.build.lib.actions.FileValue;
-import com.google.devtools.build.lib.analysis.config.PackageProviderForConfigurations;
-import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
-import com.google.devtools.build.lib.cmdline.PackageIdentifier;
-import com.google.devtools.build.lib.events.ExtendedEventHandler;
-import com.google.devtools.build.lib.packages.NoSuchPackageException;
-import com.google.devtools.build.lib.packages.NoSuchTargetException;
-import com.google.devtools.build.lib.packages.Package;
-import com.google.devtools.build.lib.packages.Target;
-import com.google.devtools.build.lib.skyframe.SkyframeExecutor.SkyframePackageLoader;
-import com.google.devtools.build.lib.vfs.RootedPath;
-import com.google.devtools.build.skyframe.MemoizingEvaluator;
-import com.google.devtools.build.skyframe.SkyFunction;
-import com.google.devtools.build.skyframe.SkyKey;
-import java.io.IOException;
-
-/**
- * Repeats functionality of {@link SkyframePackageLoader} but uses
- * {@link SkyFunction.Environment#getValue} instead of {@link MemoizingEvaluator#evaluate}
- * for node evaluation
- */
-class SkyframePackageLoaderWithValueEnvironment implements PackageProviderForConfigurations {
-  private final SkyFunction.Environment env;
-
-  SkyframePackageLoaderWithValueEnvironment(SkyFunction.Environment env) {
-    this.env = env;
-  }
-
-  @Override
-  public ExtendedEventHandler getEventHandler() {
-    return env.getListener();
-  }
-
-  private Package getPackage(final PackageIdentifier pkgIdentifier)
-      throws NoSuchPackageException, InterruptedException {
-    SkyKey key = PackageValue.key(pkgIdentifier);
-    PackageValue value = (PackageValue) env.getValueOrThrow(key, NoSuchPackageException.class);
-    if (value != null) {
-      return value.getPackage();
-    }
-    return null;
-  }
-
-  @Override
-  public Target getTarget(Label label)
-      throws NoSuchPackageException, NoSuchTargetException, InterruptedException {
-    Package pkg = getPackage(label.getPackageIdentifier());
-    return pkg == null ? null : pkg.getTarget(label.getName());
-  }
-
-  @Override
-  public void addDependency(Package pkg, String fileName)
-      throws LabelSyntaxException, IOException, InterruptedException {
-    RootedPath fileRootedPath = RootedPath.toRootedPath(pkg.getSourceRoot(),
-        pkg.getPackageIdentifier().getSourceRoot().getRelative(fileName));
-    FileValue result = (FileValue) env.getValue(FileValue.key(fileRootedPath));
-    if (result != null && !result.exists()) {
-      throw new IOException();
-    }
-  }
-
-  @Override
-  public boolean valuesMissing() {
-    return env.valuesMissing();
-  }
-}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
index 0f1efb8ec4db7e..128628df0886ad 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/BuildViewTest.java
@@ -33,7 +33,6 @@
 import com.google.devtools.build.lib.actions.Artifact;
 import com.google.devtools.build.lib.actions.FailAction;
 import com.google.devtools.build.lib.analysis.config.BuildConfiguration;
-import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
 import com.google.devtools.build.lib.analysis.config.transitions.NoTransition;
 import com.google.devtools.build.lib.analysis.configuredtargets.InputFileConfiguredTarget;
 import com.google.devtools.build.lib.analysis.configuredtargets.OutputFileConfiguredTarget;
@@ -1056,18 +1055,6 @@ public void testLoadingErrorReportedCorrectly() throws Exception {
         .contains("command succeeded, but there were loading phase errors");
   }
 
-  @Test
-  public void testBadLabelInConfiguration() throws Exception {
-    useConfiguration("--crosstool_top=//third_party/crosstool/v2");
-    reporter.removeHandler(failFastHandler);
-    try {
-      update(defaultFlags().with(Flag.KEEP_GOING));
-      fail();
-    } catch (InvalidConfigurationException e) {
-      assertThat(e).hasMessageThat().contains("third_party/crosstool/v2");
-    }
-  }
-
   @Test
   public void testVisibilityReferencesNonexistentPackage() throws Exception {
     scratch.file("z/a/BUILD",
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/ConfigurableAttributesTest.java b/src/test/java/com/google/devtools/build/lib/analysis/ConfigurableAttributesTest.java
index 2c905db17632c6..af8e26f0f112bd 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/ConfigurableAttributesTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/ConfigurableAttributesTest.java
@@ -19,9 +19,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment;
-import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment.TargetProviderEnvironment;
-import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
 import com.google.devtools.build.lib.analysis.util.MockRule;
 import com.google.devtools.build.lib.cmdline.Label;
@@ -328,75 +325,6 @@ public void duplicatesInSameBranchMultipleSelects() throws Exception {
         "Label '//java/hello:a.java' is duplicated in the 'srcs' attribute of rule 'hello'");
   }
 
-  /**
-   * Tests that {@link RedirectChaser} doesn't support configured attribute instances, and
-   * triggers an appropriate error upon finding them.
-   */
-  @Test
-  public void redirectChaser() throws Exception {
-    writeConfigRules();
-    useConfiguration("--test_arg=a");
-    scratch.file("java/hello/BUILD",
-        "alias(",
-            "name = 'good_base',",
-            "actual = ':good_redirect')",
-        "alias(",
-            "name = 'good_redirect',",
-            "actual = ':actual_content')",
-        "filegroup(",
-            "name = 'actual_content',",
-            "srcs = ['a.txt', 'b.txt'])",
-        "alias(",
-            "name = 'bad_base',",
-            "actual = ':bad_redirect')",
-        "alias(",
-            "name = 'bad_redirect',",
-            "actual = select({",
-        "        '//conditions:a': ':actual_content',",
-        "        '" + BuildType.Selector.DEFAULT_CONDITION_KEY + "': ':actual_content',",
-        "    }))",
-        "genrule(",
-        "    name = 'non_filegroup_target',",
-        "    srcs = [ 'whatever' ],",
-        "    outs = [ 'whateverelse' ],",
-        "    cmd = 'true')",
-        "alias(",
-        "   name = 'base_non_filegroup_target',",
-        "   actual = ':non_filegroup_target')"
-        );
-    ConfigurationEnvironment env =
-        new TargetProviderEnvironment(getSkyframeExecutor().getPackageManager(), reporter);
-
-    // Legal case:
-    assertThat(
-            RedirectChaser.followRedirects(
-                    env, Label.parseAbsolute("//java/hello:good_base", ImmutableMap.of()), "srcs")
-                .toString())
-        .isEqualTo("//java/hello:actual_content");
-
-    // Legal case:
-    assertThat(
-            RedirectChaser.followRedirects(
-                    env,
-                    Label.parseAbsolute(
-                        "//java/hello:base_non_filegroup_target", ImmutableMap.of()),
-                    "srcs")
-                .toString())
-        .isEqualTo("//java/hello:non_filegroup_target");
-
-    // Illegal case:
-    try {
-      RedirectChaser.followRedirects(
-          env, Label.parseAbsolute("//java/hello:bad_base", ImmutableMap.of()), "srcs");
-      fail("Expected RedirectChaser to fail on a sequence with configurable 'srcs' values");
-    } catch (InvalidConfigurationException e) {
-      // Expected failure..
-      assertThat(e)
-          .hasMessageThat()
-          .isEqualTo("The value of 'actual' cannot be configuration-dependent");
-    }
-  }
-
   /**
    * Attributes of type {@link BuildType#OUTPUT} are not configurable.
    */
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
index 554d1b61dc2348..b9ddeebffc5ac8 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
@@ -102,11 +102,11 @@ public void testHostCrosstoolTop() throws Exception {
     BuildConfigurationCollection configs = createCollection("--cpu=piii");
     BuildConfiguration config = Iterables.getOnlyElement(configs.getTargetConfigurations());
     assertThat(config.getFragment(CppConfiguration.class).getRuleProvidingCcToolchainProvider())
-        .isEqualTo(Label.parseAbsoluteUnchecked("//third_party/crosstool/mock:everything"));
+        .isEqualTo(Label.parseAbsoluteUnchecked("//tools/cpp:toolchain"));
 
     BuildConfiguration hostConfig = configs.getHostConfiguration();
     assertThat(hostConfig.getFragment(CppConfiguration.class).getRuleProvidingCcToolchainProvider())
-        .isEqualTo(Label.parseAbsoluteUnchecked("//third_party/crosstool/mock:everything"));
+        .isEqualTo(Label.parseAbsoluteUnchecked("//tools/cpp:toolchain"));
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
index 9626bb618881ae..8e520e07b78a76 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/BazelAnalysisMock.java
@@ -103,8 +103,7 @@ public void setupMockClient(MockToolsConfig config) throws IOException {
         "filegroup(name='langtools', srcs=['jdk/lib/tools.jar'])",
         "filegroup(name='bootclasspath', srcs=['jdk/jre/lib/rt.jar'])",
         "filegroup(name='extdir', srcs=glob(['jdk/jre/lib/ext/*']))",
-        // "dummy" is needed so that RedirectChaser stops here
-        "filegroup(name='java', srcs = ['jdk/jre/bin/java', 'dummy'])",
+        "filegroup(name='java', srcs = ['jdk/jre/bin/java'])",
         "filegroup(name='JacocoCoverage', srcs = [])",
         "filegroup(name='jacoco-blaze-agent', srcs = [])",
         "exports_files(['JavaBuilder_deploy.jar','SingleJar_deploy.jar','TestRunner_deploy.jar',",
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/Crosstool.java b/src/test/java/com/google/devtools/build/lib/packages/util/Crosstool.java
index 9ac98bed0402dc..eae3c948b78bf1 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/Crosstool.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/Crosstool.java
@@ -135,15 +135,17 @@ public void write() throws IOException {
               toolchain.getCompiler()));
 
       // Generate cc_toolchain target
+      String suffix = toolchain.getTargetCpu() + "-" + toolchain.getCompiler();
       compilationTools.append(
           Joiner.on("\n")
               .join(
+                  "toolchain(",
+                  "  name = 'cc-toolchain-" + suffix + "',",
+                  "  toolchain_type = ':toolchain_type',",
+                  "  toolchain = ':cc-compiler-" + suffix + "',",
+                  ")",
                   "cc_toolchain(",
-                  "  name = 'cc-compiler-"
-                      + toolchain.getTargetCpu()
-                      + "-"
-                      + toolchain.getCompiler()
-                      + "',",
+                  "  name = 'cc-compiler-" + suffix + "',",
                   "  toolchain_identifier = '" + toolchain.getToolchainIdentifier() + "',",
                   "  output_licenses = ['unencumbered'],",
                   addModuleMap ? "    module_map = 'crosstool.cppmap'," : "",
@@ -176,6 +178,8 @@ public void write() throws IOException {
                 "package(default_visibility=['//visibility:public'])",
                 "licenses(['restricted'])",
                 "",
+                "toolchain_type(name = 'toolchain_type')",
+                "cc_toolchain_alias(name = 'current_cc_toolchain')",
                 "alias(name = 'toolchain', actual = 'everything')",
                 "filegroup(name = 'everything-multilib',",
                 "          srcs = glob(['" + version + "/**/*'],",
@@ -194,6 +198,10 @@ public void write() throws IOException {
                 compilationTools.toString(),
                 runtimes,
                 "",
+                "filegroup(",
+                "    name = 'interface_library_builder',",
+                "    srcs = ['build_interface_so'],",
+                ")",
                 // We add an empty :malloc target in case we need it.
                 "cc_library(name = 'malloc')");
 
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java b/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java
index 2a9b7f95dd3815..9d83872a3217da 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/MockPlatformSupport.java
@@ -114,7 +114,7 @@ public static void addMockPiiiPlatform(MockToolsConfig mockToolsConfig, Label cr
         "   toolchain_type = '" + TestConstants.TOOLS_REPOSITORY + "//tools/cpp:toolchain_type',",
         "   toolchain = '"
             + crosstoolLabel.getRelativeWithRemapping(
-                "cc-compiler-piii-gcc-4.4.0", ImmutableMap.of())
+                "cc-compiler-piii-compiler", ImmutableMap.of())
             + "',",
         "   target_compatible_with = [':mock_value'],",
         ")");
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java
index 1e6a4c6a386df6..3223b93a9b9df3 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcToolchainSelectionTest.java
@@ -16,7 +16,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
@@ -57,6 +56,8 @@ private CppCompileAction getCppCompileAction(String label) throws Exception {
 
   @Test
   public void testResolvedCcToolchain() throws Exception {
+    String crosstool = analysisMock.ccSupport().readCrosstoolFile();
+    getAnalysisMock().ccSupport().setupCrosstoolWithRelease(mockToolsConfig, crosstool);
     useConfiguration(
         "--enabled_toolchain_types=" + CPP_TOOLCHAIN_TYPE,
         "--experimental_platforms=//mock_platform:mock-piii-platform",
@@ -76,24 +77,8 @@ public void testResolvedCcToolchain() throws Exception {
 
   @Test
   public void testToolchainSelectionWithPlatforms() throws Exception {
-    useConfiguration(
-        "--enabled_toolchain_types=" + CPP_TOOLCHAIN_TYPE,
-        "--experimental_platforms=//mock_platform:mock-piii-platform",
-        "--extra_toolchains=//mock_platform:toolchain_cc-compiler-piii");
-    ScratchAttributeWriter.fromLabelString(this, "cc_library", "//lib")
-        .setList("srcs", "a.cc")
-        .write();
-    assertNoEvents();
-    CppCompileAction compileAction = getCppCompileAction("//lib");
-    boolean isPiii =
-        ImmutableList.copyOf(compileAction.getInputs())
-            .stream()
-            .anyMatch(artifact -> artifact.getExecPathString().endsWith("piii"));
-    assertThat(isPiii).isTrue();
-  }
-
-  @Test
-  public void testCToolchainSelectionFromCcToolchainAttrs() throws Exception {
+    String crosstool = analysisMock.ccSupport().readCrosstoolFile();
+    getAnalysisMock().ccSupport().setupCrosstoolWithRelease(mockToolsConfig, crosstool);
     useConfiguration(
         "--enabled_toolchain_types=" + CPP_TOOLCHAIN_TYPE,
         "--experimental_platforms=//mock_platform:mock-piii-platform",
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java
index 177e5f7175acd4..45a05868d5caf5 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CrosstoolConfigurationLoaderTest.java
@@ -22,7 +22,6 @@
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.TemplateVariableInfo;
 import com.google.devtools.build.lib.analysis.config.CompilationMode;
-import com.google.devtools.build.lib.analysis.config.ConfigurationEnvironment;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
 import com.google.devtools.build.lib.analysis.platform.ToolchainInfo;
 import com.google.devtools.build.lib.analysis.util.AnalysisTestCase;
@@ -49,10 +48,7 @@ public class CrosstoolConfigurationLoaderTest extends AnalysisTestCase {
 
   private CppConfiguration create(CppConfigurationLoader loader, String... args) throws Exception {
     useConfiguration(args);
-    ConfigurationEnvironment env =
-        new ConfigurationEnvironment.TargetProviderEnvironment(
-            skyframeExecutor.getPackageManager(), reporter);
-    return loader.create(env, buildOptions);
+    return loader.create(buildOptions);
   }
 
   private CppConfigurationLoader loader(String crosstoolFileContents) throws IOException {