diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/toolchains/ToolchainResolutionFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/toolchains/ToolchainResolutionFunction.java
index 67f0f5f7fdea55..325e07454f810a 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/toolchains/ToolchainResolutionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/toolchains/ToolchainResolutionFunction.java
@@ -153,20 +153,10 @@ public UnloadedToolchainContext compute(SkyKey skyKey, Environment env)
     }
   }
 
-  @AutoValue
-  abstract static class ToolchainType {
-    abstract ToolchainTypeRequirement toolchainTypeRequirement();
-
-    abstract ToolchainTypeInfo toolchainTypeInfo();
-
-    static ToolchainType create(
-        ToolchainTypeRequirement toolchainTypeRequirement, ToolchainTypeInfo toolchainTypeInfo) {
-      return new AutoValue_ToolchainResolutionFunction_ToolchainType(
-          toolchainTypeRequirement, toolchainTypeInfo);
-    }
-
+  private record ToolchainType(
+      ToolchainTypeRequirement toolchainTypeRequirement, ToolchainTypeInfo toolchainTypeInfo) {
     public boolean mandatory() {
-      return toolchainTypeRequirement().mandatory();
+      return toolchainTypeRequirement.mandatory();
     }
   }
 
@@ -219,7 +209,7 @@ private ImmutableSet<ToolchainType> loadToolchainTypes(
             toolchainTypeRequirement.toBuilder().toolchainType(toolchainTypeLabel).build();
       }
 
-      resolved.add(ToolchainType.create(toolchainTypeRequirement, toolchainTypeInfo));
+      resolved.add(new ToolchainType(toolchainTypeRequirement, toolchainTypeInfo));
     }
     return resolved.build();
   }