diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java
index 167b2596cc0b80..e2236372a91e4d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java
@@ -75,8 +75,8 @@
 import com.google.devtools.build.lib.packages.ImplicitOutputsFunction.StarlarkImplicitOutputsFunctionWithCallback;
 import com.google.devtools.build.lib.packages.ImplicitOutputsFunction.StarlarkImplicitOutputsFunctionWithMap;
 import com.google.devtools.build.lib.packages.LabelConverter;
+import com.google.devtools.build.lib.packages.Package;
 import com.google.devtools.build.lib.packages.Package.NameConflictException;
-import com.google.devtools.build.lib.packages.PackageFactory.PackageContext;
 import com.google.devtools.build.lib.packages.PredicateWithMessage;
 import com.google.devtools.build.lib.packages.RuleClass;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
@@ -1037,8 +1037,8 @@ public Object call(StarlarkThread thread, Tuple args, Dict<String, Object> kwarg
       if (ruleClass == null) {
         throw new EvalException("Invalid rule class hasn't been exported by a bzl file");
       }
-      PackageContext pkgContext = thread.getThreadLocal(PackageContext.class);
-      if (pkgContext == null) {
+      Package.Builder pkgBuilder = thread.getThreadLocal(Package.Builder.class);
+      if (pkgBuilder == null) {
         throw new EvalException(
             "Cannot instantiate a rule when loading a .bzl file. "
                 + "Rules may be instantiated only in a BUILD thread.");
@@ -1086,7 +1086,7 @@ public Object call(StarlarkThread thread, Tuple args, Dict<String, Object> kwarg
                             currentRuleClass.getName(),
                             attr,
                             value,
-                            pkgContext.getBuilder().getLabelConverter());
+                            pkgBuilder.getLabelConverter());
                 initializerKwargs.put(attr.getName(), reifiedValue);
               }
             }
@@ -1141,7 +1141,7 @@ public Object call(StarlarkThread thread, Tuple args, Dict<String, Object> kwarg
           new BuildLangTypedAttributeValuesMap(kwargs);
       try {
         RuleFactory.createAndAddRule(
-            pkgContext.getBuilder(),
+            pkgBuilder,
             ruleClass,
             attributeValues,
             thread
@@ -1149,7 +1149,7 @@ public Object call(StarlarkThread thread, Tuple args, Dict<String, Object> kwarg
                 .getBool(BuildLanguageOptions.INCOMPATIBLE_FAIL_ON_UNKNOWN_ATTRIBUTES),
             // TODO(#19922): Delete this arg once it's definitely redundant (when the builder owns
             // its eventHandler).
-            pkgContext.getBuilder().getLocalEventHandler(),
+            pkgBuilder.getLocalEventHandler(),
             thread.getCallStack());
       } catch (InvalidRuleException | NameConflictException e) {
         throw new EvalException(e);
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryModule.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryModule.java
index 86694ea38f3ae2..8ae318f024de68 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryModule.java
@@ -38,7 +38,6 @@
 import com.google.devtools.build.lib.packages.Package;
 import com.google.devtools.build.lib.packages.Package.NameConflictException;
 import com.google.devtools.build.lib.packages.PackageFactory;
-import com.google.devtools.build.lib.packages.PackageFactory.PackageContext;
 import com.google.devtools.build.lib.packages.RuleClass;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
 import com.google.devtools.build.lib.packages.RuleFactory.InvalidRuleException;
@@ -244,18 +243,17 @@ private Object createRuleLegacy(StarlarkThread thread, Dict<String, Object> kwar
       String ruleClassName = getRuleClassName();
       try {
         RuleClass ruleClass = builder.build(ruleClassName, ruleClassName);
-        PackageContext context = PackageFactory.getContext(thread);
-        Package.Builder packageBuilder = context.getBuilder();
+        Package.Builder pkgBuilder = PackageFactory.getContext(thread);
 
         // TODO(adonovan): is this cast safe? Check.
         String name = (String) kwargs.get("name");
         if (name == null) {
           throw Starlark.errorf("argument 'name' is required");
         }
-        WorkspaceFactoryHelper.addMainRepoEntry(packageBuilder, name);
-        WorkspaceFactoryHelper.addRepoMappings(packageBuilder, kwargs, name);
+        WorkspaceFactoryHelper.addMainRepoEntry(pkgBuilder, name);
+        WorkspaceFactoryHelper.addRepoMappings(pkgBuilder, kwargs, name);
         return WorkspaceFactoryHelper.createAndAddRepositoryRule(
-            context.getBuilder(),
+            pkgBuilder,
             ruleClass,
             /* bindRuleClass= */ null,
             WorkspaceFactoryHelper.getFinalKwargs(kwargs),
diff --git a/src/main/java/com/google/devtools/build/lib/packages/BuildGlobals.java b/src/main/java/com/google/devtools/build/lib/packages/BuildGlobals.java
index 965f22e8b66ec2..7a6b2489400b73 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/BuildGlobals.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/BuildGlobals.java
@@ -18,7 +18,6 @@
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.cmdline.LabelSyntaxException;
 import com.google.devtools.build.lib.packages.License.DistributionType;
-import com.google.devtools.build.lib.packages.PackageFactory.PackageContext;
 import com.google.devtools.build.lib.packages.Type.ConversionException;
 import com.google.devtools.build.lib.server.FailureDetails.PackageLoading.Code;
 import java.util.List;
@@ -77,23 +76,21 @@ public NoneType environmentGroup(
       StarlarkThread thread)
       throws EvalException {
     BazelStarlarkContext.checkLoadingPhase(thread, "environment_group");
-    PackageContext context = PackageFactory.getContext(thread);
+    Package.Builder pkgBuilder = PackageFactory.getContext(thread);
     List<Label> environments =
         BuildType.LABEL_LIST.convert(
-            environmentsList,
-            "'environment_group argument'",
-            context.pkgBuilder.getLabelConverter());
+            environmentsList, "'environment_group argument'", pkgBuilder.getLabelConverter());
     List<Label> defaults =
         BuildType.LABEL_LIST.convert(
-            defaultsList, "'environment_group argument'", context.pkgBuilder.getLabelConverter());
+            defaultsList, "'environment_group argument'", pkgBuilder.getLabelConverter());
 
     if (environments.isEmpty()) {
       throw Starlark.errorf("environment group %s must contain at least one environment", name);
     }
     try {
       Location loc = thread.getCallerLocation();
-      context.pkgBuilder.addEnvironmentGroup(
-          name, environments, defaults, context.getBuilder().getLocalEventHandler(), loc);
+      pkgBuilder.addEnvironmentGroup(
+          name, environments, defaults, pkgBuilder.getLocalEventHandler(), loc);
       return Starlark.NONE;
     } catch (LabelSyntaxException e) {
       throw Starlark.errorf("environment group has invalid name: %s: %s", name, e.getMessage());
@@ -120,18 +117,17 @@ public NoneType licenses(
       StarlarkThread thread)
       throws EvalException {
     BazelStarlarkContext.checkLoadingPhase(thread, "licenses");
-    PackageContext context = PackageFactory.getContext(thread);
+    Package.Builder pkgBuilder = PackageFactory.getContext(thread);
     try {
       License license = BuildType.LICENSE.convert(licensesList, "'licenses' operand");
-      context.pkgBuilder.mergePackageArgsFrom(PackageArgs.builder().setLicense(license));
+      pkgBuilder.mergePackageArgsFrom(PackageArgs.builder().setLicense(license));
     } catch (ConversionException e) {
-      context
-          .getBuilder()
+      pkgBuilder
           .getLocalEventHandler()
           .handle(
               Package.error(
                   thread.getCallerLocation(), e.getMessage(), Code.LICENSE_PARSE_FAILURE));
-      context.pkgBuilder.setContainsErrors();
+      pkgBuilder.setContainsErrors();
     }
     return Starlark.NONE;
   }
@@ -146,20 +142,19 @@ public NoneType licenses(
       useStarlarkThread = true)
   public NoneType distribs(Object object, StarlarkThread thread) throws EvalException {
     BazelStarlarkContext.checkLoadingPhase(thread, "distribs");
-    PackageContext context = PackageFactory.getContext(thread);
+    Package.Builder pkgBuilder = PackageFactory.getContext(thread);
 
     try {
       Set<DistributionType> distribs =
           BuildType.DISTRIBUTIONS.convert(object, "'distribs' operand");
-      context.pkgBuilder.mergePackageArgsFrom(PackageArgs.builder().setDistribs(distribs));
+      pkgBuilder.mergePackageArgsFrom(PackageArgs.builder().setDistribs(distribs));
     } catch (ConversionException e) {
-      context
-          .getBuilder()
+      pkgBuilder
           .getLocalEventHandler()
           .handle(
               Package.error(
                   thread.getCallerLocation(), e.getMessage(), Code.DISTRIBUTIONS_PARSE_FAILURE));
-      context.pkgBuilder.setContainsErrors();
+      pkgBuilder.setContainsErrors();
     }
     return Starlark.NONE;
   }
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageCallable.java b/src/main/java/com/google/devtools/build/lib/packages/PackageCallable.java
index 50280a06999c86..fbc867c5ac6756 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageCallable.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageCallable.java
@@ -39,7 +39,7 @@ protected PackageCallable() {}
       useStarlarkThread = true)
   public Object packageCallable(Map<String, Object> kwargs, StarlarkThread thread)
       throws EvalException {
-    Package.Builder pkgBuilder = PackageFactory.getContext(thread).pkgBuilder;
+    Package.Builder pkgBuilder = PackageFactory.getContext(thread);
     if (pkgBuilder.isPackageFunctionUsed()) {
       throw new EvalException("'package' can only be used once per BUILD file");
     }
diff --git a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
index bd01100d60a6d2..c908a8853d3750 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/PackageFactory.java
@@ -208,12 +208,16 @@ public RuleClassProvider getRuleClassProvider() {
     return ruleClassProvider;
   }
 
-  /** Get the PackageContext by looking up in the environment. */
-  // TODO(#19922): Eliminate PackageContext and retrieve the Package.Builder directly instead.
-  public static PackageContext getContext(StarlarkThread thread) throws EvalException {
-    PackageContext value = thread.getThreadLocal(PackageContext.class);
+  /**
+   * Retrieves the {@link Package.Builder} from the given {@link StarlarkThread}, or throws {@link
+   * EvalException} if unavailable.
+   */
+  // TODO(#19922): The name is a holdover from when we had PackageContext. Migrate this to a static
+  // fromOrFail method on Package.Builder or a new parent interface of it.
+  public static Package.Builder getContext(StarlarkThread thread) throws EvalException {
+    Package.Builder value = thread.getThreadLocal(Package.Builder.class);
     if (value == null) {
-      // if PackageContext is missing, we're not called from a BUILD file. This happens if someone
+      // if PackageBuilder is missing, we're not called from a BUILD file. This happens if someone
       // uses native.some_func() in the wrong place.
       throw Starlark.errorf(
           "The native module can be accessed only from a BUILD thread. "
@@ -282,31 +286,6 @@ public NonSkyframeGlobber createNonSkyframeGlobber(
             threadStateReceiverForMetrics));
   }
 
-  /**
-   * This class holds state associated with the construction of a single package for the duration of
-   * execution of one BUILD file. (We use a PackageContext object in preference to storing these
-   * values in mutable fields of the PackageFactory.)
-   *
-   * <p>PLEASE NOTE: the PackageContext is referred to by the StarlarkThread, but should become
-   * unreachable once the StarlarkThread is discarded at the end of evaluation. Please be aware of
-   * your memory footprint when making changes here!
-   */
-  // TODO(#19922): Merge this into Package.Builder, store the builder directly using
-  // StarlarkThread.setThreadLocal.
-  public static class PackageContext {
-    final Package.Builder pkgBuilder;
-
-    @VisibleForTesting
-    public PackageContext(Package.Builder pkgBuilder) {
-      this.pkgBuilder = pkgBuilder;
-    }
-
-    /** Returns the builder of this Package. */
-    public Package.Builder getBuilder() {
-      return pkgBuilder;
-    }
-  }
-
   /**
    * Runs final validation and administrative tasks on newly loaded package. Called by a caller of
    * {@link #executeBuildFile} after this caller has fully loaded the package.
@@ -423,7 +402,6 @@ private void executeBuildFileImpl(
     pkgBuilder.setLoads(loadedModules.values());
 
     StoredEventHandler eventHandler = new StoredEventHandler();
-    PackageContext pkgContext = new PackageContext(pkgBuilder);
     pkgBuilder.setLocalEventHandler(eventHandler);
 
     try (Mutability mu = Mutability.create("package", pkgBuilder.getFilename())) {
@@ -437,16 +415,14 @@ private void executeBuildFileImpl(
               new SymbolGenerator<>(pkgBuilder.getPackageIdentifier()))
           .storeInThread(thread);
 
-      // TODO(adonovan): save this as a field in BazelStarlarkContext.
-      // It needn't be a second thread-local.
-      thread.setThreadLocal(PackageContext.class, pkgContext);
+      // TODO(#19922): Have Package.Builder inherit from BazelStarlarkContext and only store one
+      // thread-local object.
+      thread.setThreadLocal(Package.Builder.class, pkgBuilder);
 
       // TODO(b/291752414): The rule definition environment shouldn't be needed at BUILD evaluation
       // time EXCEPT for analysis_test, which needs the tools repository for use in
       // StarlarkRuleClassFunctions#createRule. So we set it here as a thread-local to be retrieved
       // by StarlarkTestingModule#analysisTest.
-      // TODO(b/236456122): Though instead of being a separate thread-local, we should stick it and
-      // PackageContext on a new PackageThreadContext object.
       thread.setThreadLocal(RuleDefinitionEnvironment.class, ruleClassProvider);
 
       try {
@@ -456,7 +432,7 @@ private void executeBuildFileImpl(
             Package.error(null, ex.getMessageWithStack(), Code.STARLARK_EVAL_ERROR));
         pkgBuilder.setContainsErrors();
       } catch (InterruptedException ex) {
-        if (pkgContext.pkgBuilder.containsErrors()) {
+        if (pkgBuilder.containsErrors()) {
           // Suppress the interrupted exception: we have an error of our own to return.
           Thread.currentThread().interrupt();
           logger.atInfo().withCause(ex).log(
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleFactory.java b/src/main/java/com/google/devtools/build/lib/packages/RuleFactory.java
index 7f48961243ca0d..f2e8a90979f014 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleFactory.java
@@ -22,7 +22,6 @@
 import com.google.devtools.build.lib.events.EventHandler;
 import com.google.devtools.build.lib.packages.Attribute.StarlarkComputedDefaultTemplate.CannotPrecomputeDefaultsException;
 import com.google.devtools.build.lib.packages.Package.NameConflictException;
-import com.google.devtools.build.lib.packages.PackageFactory.PackageContext;
 import com.google.devtools.build.lib.packages.RuleClass.Builder.RuleClassType;
 import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
@@ -292,16 +291,16 @@ public NoneType call(StarlarkThread thread, Tuple args, Dict<String, Object> kwa
       }
       BazelStarlarkContext.checkLoadingOrWorkspacePhase(thread, ruleClass.getName());
       try {
-        PackageContext context = PackageFactory.getContext(thread);
+        Package.Builder pkgBuilder = PackageFactory.getContext(thread);
         RuleFactory.createAndAddRule(
-            context.pkgBuilder,
+            pkgBuilder,
             ruleClass,
             new BuildLangTypedAttributeValuesMap(kwargs),
             thread
                 .getSemantics()
                 .getBool(BuildLanguageOptions.INCOMPATIBLE_FAIL_ON_UNKNOWN_ATTRIBUTES),
             // TODO(#19922): createAndAddRule() should get this from the builder arg directly.
-            context.getBuilder().getLocalEventHandler(),
+            pkgBuilder.getLocalEventHandler(),
             thread.getCallStack());
       } catch (RuleFactory.InvalidRuleException | Package.NameConflictException e) {
         throw new EvalException(e);
diff --git a/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeModule.java b/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeModule.java
index f3f98a08034632..ac759c72f69358 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeModule.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/StarlarkNativeModule.java
@@ -33,7 +33,6 @@
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.io.FileSymlinkException;
 import com.google.devtools.build.lib.packages.Globber.BadGlobException;
-import com.google.devtools.build.lib.packages.PackageFactory.PackageContext;
 import com.google.devtools.build.lib.packages.semantics.BuildLanguageOptions;
 import com.google.devtools.build.lib.server.FailureDetails.PackageLoading.Code;
 import com.google.devtools.build.lib.starlarkbuildapi.StarlarkNativeModuleApi;
@@ -98,7 +97,7 @@ public Sequence<?> glob(
       StarlarkThread thread)
       throws EvalException, InterruptedException {
     BazelStarlarkContext.checkLoadingPhase(thread, "native.glob");
-    PackageContext context = getContext(thread);
+    Package.Builder pkgBuilder = getContext(thread);
 
     List<String> includes = Type.STRING_LIST.convert(include, "'glob' argument");
     List<String> excludes = Type.STRING_LIST.convert(exclude, "'glob' argument");
@@ -116,7 +115,7 @@ public Sequence<?> glob(
           "expected boolean for argument `allow_empty`, got `%s`", allowEmptyArgument);
     }
 
-    List<String> matches = runGlobOperation(context, thread, includes, excludes, op, allowEmpty);
+    List<String> matches = runGlobOperation(pkgBuilder, thread, includes, excludes, op, allowEmpty);
 
     ArrayList<String> result = new ArrayList<>(matches.size());
     for (String match : matches) {
@@ -436,8 +435,8 @@ public Object existingRule(String name, StarlarkThread thread) throws EvalExcept
       return Starlark.NONE;
     }
     BazelStarlarkContext.checkLoadingOrWorkspacePhase(thread, "native.existing_rule");
-    PackageContext context = getContext(thread);
-    Target target = context.pkgBuilder.getTarget(name);
+    Package.Builder pkgBuilder = getContext(thread);
+    Target target = pkgBuilder.getTarget(name);
     if (target instanceof Rule /* `instanceof` also verifies that target != null */) {
       Rule rule = (Rule) target;
       if (thread
@@ -509,13 +508,13 @@ public Object existingRules(StarlarkThread thread) throws EvalException {
       return Dict.empty();
     }
     BazelStarlarkContext.checkLoadingOrWorkspacePhase(thread, "native.existing_rules");
-    PackageContext context = getContext(thread);
+    Package.Builder pkgBuilder = getContext(thread);
     if (thread
         .getSemantics()
         .getBool(BuildLanguageOptions.INCOMPATIBLE_EXISTING_RULES_IMMUTABLE_VIEW)) {
-      return new ExistingRulesView(context.pkgBuilder.getRulesSnapshotView());
+      return new ExistingRulesView(pkgBuilder.getRulesSnapshotView());
     } else {
-      Collection<Target> targets = context.pkgBuilder.getTargets();
+      Collection<Target> targets = pkgBuilder.getTargets();
       Mutability mu = thread.mutability();
       Dict.Builder<String, Dict<String, Object>> rules = Dict.builder();
       for (Target t : targets) {
@@ -532,17 +531,17 @@ public NoneType packageGroup(
       String name, Sequence<?> packagesO, Sequence<?> includesO, StarlarkThread thread)
       throws EvalException {
     BazelStarlarkContext.checkLoadingPhase(thread, "native.package_group");
-    PackageContext context = getContext(thread);
+    Package.Builder pkgBuilder = getContext(thread);
 
     List<String> packages =
         Type.STRING_LIST.convert(packagesO, "'package_group.packages argument'");
     List<Label> includes =
         BuildType.LABEL_LIST.convert(
-            includesO, "'package_group.includes argument'", context.pkgBuilder.getLabelConverter());
+            includesO, "'package_group.includes argument'", pkgBuilder.getLabelConverter());
 
     Location loc = thread.getCallerLocation();
     try {
-      context.pkgBuilder.addPackageGroup(
+      pkgBuilder.addPackageGroup(
           name,
           packages,
           includes,
@@ -553,7 +552,7 @@ public NoneType packageGroup(
               .getSemantics()
               .getBool(BuildLanguageOptions.INCOMPATIBLE_FIX_PACKAGE_GROUP_REPOROOT_SYNTAX),
           // TODO(#19922): addPackageGroup should access the builder's own eventHandler directly.
-          context.getBuilder().getLocalEventHandler(),
+          pkgBuilder.getLocalEventHandler(),
           loc);
       return Starlark.NONE;
     } catch (LabelSyntaxException e) {
@@ -568,7 +567,7 @@ public NoneType exportsFiles(
       Sequence<?> srcs, Object visibilityO, Object licensesO, StarlarkThread thread)
       throws EvalException {
     BazelStarlarkContext.checkLoadingPhase(thread, "native.exports_files");
-    Package.Builder pkgBuilder = getContext(thread).pkgBuilder;
+    Package.Builder pkgBuilder = getContext(thread);
     List<String> files = Type.STRING_LIST.convert(srcs, "'exports_files' operand");
 
     RuleVisibility visibility =
@@ -609,7 +608,7 @@ public NoneType exportsFiles(
   @Override
   public String packageName(StarlarkThread thread) throws EvalException {
     BazelStarlarkContext.checkLoadingPhase(thread, "native.package_name");
-    PackageIdentifier packageId = getContext(thread).getBuilder().getPackageIdentifier();
+    PackageIdentifier packageId = getContext(thread).getPackageIdentifier();
     return packageId.getPackageFragment().getPathString();
   }
 
@@ -623,7 +622,7 @@ public String repositoryName(StarlarkThread thread) throws EvalException {
   @Override
   public String repoName(StarlarkThread thread) throws EvalException {
     BazelStarlarkContext.checkLoadingPhase(thread, "native.repo_name");
-    return getContext(thread).getBuilder().getPackageIdentifier().getRepository().getName();
+    return getContext(thread).getPackageIdentifier().getRepository().getName();
   }
 
   @Override
@@ -634,7 +633,7 @@ public Label packageRelativeLabel(Object input, StarlarkThread thread) throws Ev
     }
     try {
       String s = (String) input;
-      return getContext(thread).getBuilder().getLabelConverter().convert(s);
+      return getContext(thread).getLabelConverter().convert(s);
     } catch (LabelSyntaxException e) {
       throw Starlark.errorf("invalid label in native.package_relative_label: %s", e.getMessage());
     }
@@ -644,14 +643,14 @@ public Label packageRelativeLabel(Object input, StarlarkThread thread) throws Ev
   @Nullable
   public String moduleName(StarlarkThread thread) throws EvalException {
     BazelStarlarkContext.checkLoadingPhase(thread, "native.module_name");
-    return getContext(thread).getBuilder().getAssociatedModuleName().orElse(null);
+    return getContext(thread).getAssociatedModuleName().orElse(null);
   }
 
   @Override
   @Nullable
   public String moduleVersion(StarlarkThread thread) throws EvalException {
     BazelStarlarkContext.checkLoadingPhase(thread, "native.module_version");
-    return getContext(thread).getBuilder().getAssociatedModuleVersion().orElse(null);
+    return getContext(thread).getAssociatedModuleVersion().orElse(null);
   }
 
   private static Dict<String, Object> getRuleDict(Rule rule, Mutability mu) throws EvalException {
@@ -832,14 +831,14 @@ public Sequence<?> subpackages(
       Sequence<?> include, Sequence<?> exclude, boolean allowEmpty, StarlarkThread thread)
       throws EvalException, InterruptedException {
     BazelStarlarkContext.checkLoadingPhase(thread, "native.subpackages");
-    PackageContext context = getContext(thread);
+    Package.Builder pkgBuilder = getContext(thread);
 
     List<String> includes = Type.STRING_LIST.convert(include, "'subpackages' argument");
     List<String> excludes = Type.STRING_LIST.convert(exclude, "'subpackages' argument");
 
     List<String> matches =
         runGlobOperation(
-            context, thread, includes, excludes, Globber.Operation.SUBPACKAGES, allowEmpty);
+            pkgBuilder, thread, includes, excludes, Globber.Operation.SUBPACKAGES, allowEmpty);
     if (!matches.isEmpty()) {
       try {
         matches.sort(naturalOrder());
@@ -851,14 +850,14 @@ public Sequence<?> subpackages(
   }
 
   private List<String> runGlobOperation(
-      PackageContext context,
+      Package.Builder pkgBuilder,
       StarlarkThread thread,
       List<String> includes,
       List<String> excludes,
       Globber.Operation operation,
       boolean allowEmpty)
       throws EvalException, InterruptedException {
-    Semaphore cpuSemaphore = context.pkgBuilder.getCpuBoundSemaphore();
+    Semaphore cpuSemaphore = pkgBuilder.getCpuBoundSemaphore();
     try {
       if (cpuSemaphore != null) {
         // Throwing exceptions inside the try block before this release could lead to the semaphore
@@ -868,8 +867,8 @@ private List<String> runGlobOperation(
       // getGlobber() is not null because we're called from glob() and subpackages(), both of which
       // are guarded with checkLoadingPhase().
       Globber.Token globToken =
-          context.getBuilder().getGlobber().runAsync(includes, excludes, operation, allowEmpty);
-      return context.getBuilder().getGlobber().fetchUnsorted(globToken);
+          pkgBuilder.getGlobber().runAsync(includes, excludes, operation, allowEmpty);
+      return pkgBuilder.getGlobber().fetchUnsorted(globToken);
     } catch (IOException e) {
       logger.atWarning().withCause(e).log(
           "Exception processing includes=%s, excludes=%s)", includes, excludes);
@@ -891,8 +890,8 @@ private List<String> runGlobOperation(
               e instanceof FileSymlinkException
                   ? Code.EVAL_GLOBS_SYMLINK_ERROR
                   : Code.GLOB_IO_EXCEPTION);
-      context.getBuilder().getLocalEventHandler().handle(error);
-      context.pkgBuilder.setIOException(e, errorMessage, error.getProperty(DetailedExitCode.class));
+      pkgBuilder.getLocalEventHandler().handle(error);
+      pkgBuilder.setIOException(e, errorMessage, error.getProperty(DetailedExitCode.class));
       return ImmutableList.of();
     } catch (BadGlobException e) {
       throw new EvalException(e);
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
index cc0ea73eb4bc87..bdbe548b02d35f 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceFactory.java
@@ -120,8 +120,7 @@ public void execute(
       StarlarkThread thread = new StarlarkThread(mutability, starlarkSemantics);
       thread.setLoader(loadedModules::get);
       thread.setPrintHandler(Event.makeDebugPrintHandler(localReporter));
-      thread.setThreadLocal(
-          PackageFactory.PackageContext.class, new PackageFactory.PackageContext(builder));
+      thread.setThreadLocal(Package.Builder.class, builder);
       builder.setLocalEventHandler(localReporter);
 
       // The workspace environment doesn't need the tools repository or the fragment map
@@ -249,7 +248,7 @@ public Object call(StarlarkThread thread, Tuple args, Dict<String, Object> kwarg
           throw new EvalException("unexpected positional arguments");
         }
         try {
-          Package.Builder builder = PackageFactory.getContext(thread).pkgBuilder;
+          Package.Builder builder = PackageFactory.getContext(thread);
           // TODO(adonovan): this cast doesn't look safe!
           String externalRepoName = (String) kwargs.get("name");
           if (!allowOverride
diff --git a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java
index 1ef44d40f422d2..3246811becabd6 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/WorkspaceGlobals.java
@@ -68,7 +68,6 @@ public void workspace(
     // Add entry in repository map from "@name" --> "@" to avoid issue where bazel
     // treats references to @name as a separate external repo
     PackageFactory.getContext(thread)
-        .pkgBuilder
         .setWorkspaceName(name)
         .addRepositoryMappingEntry(RepositoryName.MAIN, name, RepositoryName.MAIN);
   }
@@ -104,7 +103,7 @@ private static ImmutableList<TargetPattern> parsePatterns(
   public void registerExecutionPlatforms(Sequence<?> platformLabels, StarlarkThread thread)
       throws EvalException {
     // Add to the package definition for later.
-    Package.Builder builder = PackageFactory.getContext(thread).pkgBuilder;
+    Package.Builder builder = PackageFactory.getContext(thread);
     List<String> patterns = Sequence.cast(platformLabels, String.class, "platform_labels");
     builder.addRegisteredExecutionPlatforms(parsePatterns(patterns, builder, thread));
   }
@@ -113,7 +112,7 @@ public void registerExecutionPlatforms(Sequence<?> platformLabels, StarlarkThrea
   public void registerToolchains(Sequence<?> toolchainLabels, StarlarkThread thread)
       throws EvalException {
     // Add to the package definition for later.
-    Package.Builder builder = PackageFactory.getContext(thread).pkgBuilder;
+    Package.Builder builder = PackageFactory.getContext(thread);
     List<String> patterns = Sequence.cast(toolchainLabels, String.class, "toolchain_labels");
     builder.addRegisteredToolchains(
         parsePatterns(patterns, builder, thread),
@@ -130,7 +129,7 @@ public void bind(String name, Object actual, StarlarkThread thread)
       throw Starlark.errorf("%s", e.getMessage());
     }
     try {
-      Package.Builder builder = PackageFactory.getContext(thread).pkgBuilder;
+      Package.Builder builder = PackageFactory.getContext(thread);
       RuleClass ruleClass = ruleClassMap.get("bind");
       RepositoryName currentRepo = getCurrentRepoName(thread);
       WorkspaceFactoryHelper.addBindRule(
diff --git a/src/main/java/com/google/devtools/build/lib/rules/test/StarlarkTestingModule.java b/src/main/java/com/google/devtools/build/lib/rules/test/StarlarkTestingModule.java
index aefcf4d3c36104..e50bde2f0a4e7f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/test/StarlarkTestingModule.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/test/StarlarkTestingModule.java
@@ -24,7 +24,7 @@
 import com.google.devtools.build.lib.events.EventKind;
 import com.google.devtools.build.lib.events.StoredEventHandler;
 import com.google.devtools.build.lib.packages.LabelConverter;
-import com.google.devtools.build.lib.packages.PackageFactory.PackageContext;
+import com.google.devtools.build.lib.packages.Package;
 import com.google.devtools.build.lib.starlarkbuildapi.test.TestingModuleApi;
 import com.google.devtools.build.lib.util.Fingerprint;
 import java.util.regex.Pattern;
@@ -68,11 +68,11 @@ public void analysisTest(
       Object attrValuesApi,
       StarlarkThread thread)
       throws EvalException, InterruptedException {
-    PackageContext pkgContext = thread.getThreadLocal(PackageContext.class);
+    Package.Builder pkgBuilder = thread.getThreadLocal(Package.Builder.class);
     RuleDefinitionEnvironment ruleDefinitionEnvironment =
         thread.getThreadLocal(RuleDefinitionEnvironment.class);
     // TODO(b/236456122): Refactor this check into a standard helper / error message
-    if (pkgContext == null || ruleDefinitionEnvironment == null) {
+    if (pkgBuilder == null || ruleDefinitionEnvironment == null) {
       throw Starlark.errorf("analysis_test can only be called in a BUILD thread");
     }
 
@@ -113,7 +113,7 @@ public void analysisTest(
     // TODO(b/291752414): Fix.
     Label dummyBzlFile = Label.createUnvalidated(PackageIdentifier.EMPTY_PACKAGE_ID, "dummy_label");
     Fingerprint fingerprint = new Fingerprint();
-    fingerprint.addString(pkgContext.getBuilder().getBuildFileLabel().getPackageName());
+    fingerprint.addString(pkgBuilder.getBuildFileLabel().getPackageName());
     fingerprint.addString(name);
     byte[] transitiveDigestToUse = fingerprint.digestAndReset();
 
@@ -164,9 +164,7 @@ public void analysisTest(
     // evaluation in BzlLoadFunction#execAndExport.
     StoredEventHandler handler = new StoredEventHandler();
     starlarkRuleFunction.export(
-        handler,
-        pkgContext.getBuilder().getBuildFileLabel(),
-        name + "_test"); // export in BUILD thread
+        handler, pkgBuilder.getBuildFileLabel(), name + "_test"); // export in BUILD thread
     if (handler.hasErrors()) {
       StringBuilder errors =
           handler.getEvents().stream()