diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetKey.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetKey.java
index 5f4b6e8..365da86 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetKey.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetKey.java
@@ -37,7 +37,8 @@
 
   private transient int hashCode;
 
-  private ConfiguredTargetKey(Label label, @Nullable BuildConfigurationValue.Key configurationKey) {
+  @AutoCodec.VisibleForSerialization
+  ConfiguredTargetKey(Label label, @Nullable BuildConfigurationValue.Key configurationKey) {
     this.label = Preconditions.checkNotNull(label);
     this.configurationKey = configurationKey;
   }
@@ -116,12 +117,6 @@
     return String.format("%s %s", label, configurationKey);
   }
 
-  @AutoCodec.Instantiator
-  static ConfiguredTargetKey create(
-      Label label, @Nullable BuildConfigurationValue.Key configurationKey) {
-    return builder().setLabel(label).setConfigurationKey(configurationKey).build();
-  }
-
   /** Returns a new {@link Builder} to create instances of {@link ConfiguredTargetKey}. */
   public static Builder builder() {
     return new Builder();
