diff --git a/changelog/@unreleased/pr-1389.v2.yml b/changelog/@unreleased/pr-1389.v2.yml
new file mode 100644
index 000000000..59fac1187
--- /dev/null
+++ b/changelog/@unreleased/pr-1389.v2.yml
@@ -0,0 +1,7 @@
+type: improvement
+improvement:
+  description: Running `./gradlew --write-locks` should be faster now, as it doesn't
+    update your `baseline-class-uniqueness.lock` file implicitly anymore. To update
+    this, you need to run `./gradlew checkClassUniqueness --write-locks`.
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/1389
diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineClassUniquenessPlugin.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineClassUniquenessPlugin.java
index 7335c092c..62bf62a53 100644
--- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineClassUniquenessPlugin.java
+++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineClassUniquenessPlugin.java
@@ -16,10 +16,7 @@
 
 package com.palantir.baseline.plugins;
 
-import com.google.common.collect.ImmutableList;
 import com.palantir.baseline.tasks.CheckClassUniquenessLockTask;
-import java.util.List;
-import org.gradle.StartParameter;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.plugins.JavaPlugin;
@@ -53,16 +50,5 @@ public final void apply(Project project) {
                 t.dependsOn(runtimeClasspath);
             });
         });
-
-        // Wire up dependencies so running `./gradlew --write-locks` will update the lock file
-        StartParameter startParam = project.getGradle().getStartParameter();
-        if (startParam.isWriteDependencyLocks()
-                && !startParam.getTaskNames().contains(checkClassUniqueness.getName())) {
-            List<String> taskNames = ImmutableList.<String>builder()
-                    .addAll(startParam.getTaskNames())
-                    .add(checkClassUniqueness.getName())
-                    .build();
-            startParam.setTaskNames(taskNames);
-        }
     }
 }
diff --git a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineClassUniquenessPluginIntegrationTest.groovy b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineClassUniquenessPluginIntegrationTest.groovy
index b314fb1fc..61a727ecc 100644
--- a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineClassUniquenessPluginIntegrationTest.groovy
+++ b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineClassUniquenessPluginIntegrationTest.groovy
@@ -57,7 +57,7 @@ class BaselineClassUniquenessPluginIntegrationTest extends AbstractPluginTest {
         result.getOutput().contains("javax.el.ArrayELResolver");
         !lockfile.exists()
 
-        with("--write-locks").build()
+        with("checkClassUniqueness", "--write-locks").build()
         lockfile.exists()
 
         File expected = new File("src/test/resources/com/palantir/baseline/baseline-class-uniqueness.expected.lock")