diff --git a/check_api/src/main/java/com/google/errorprone/VisitorState.java b/check_api/src/main/java/com/google/errorprone/VisitorState.java
index 0f4271bcbbb..76f799e0c2d 100644
--- a/check_api/src/main/java/com/google/errorprone/VisitorState.java
+++ b/check_api/src/main/java/com/google/errorprone/VisitorState.java
@@ -71,7 +71,7 @@
 /**
  * @author alexeagle@google.com (Alex Eagle)
  */
-public /* TODO: cl/931120620 - final */ class VisitorState {
+public final class VisitorState {
 
   private final SharedState sharedState;
   public final Context context;