1 files changed, 5 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationCollector.java b/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationCollector.java
index 4dc96ebbca..8c669bb058 100644
--- a/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationCollector.java
+++ b/src/main/java/com/google/devtools/build/docgen/SkylarkDocumentationCollector.java
@@ -33,7 +33,6 @@ import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -138,18 +137,12 @@ final class SkylarkDocumentationCollector {
         SkylarkModule skylarkModule = moduleClass.equals(Object.class)
             ? getTopLevelModule()
             : Runtime.getSkylarkNamespace(moduleClass).getAnnotation(SkylarkModule.class);
-        if (skylarkModule == null) {
-          // TODO(bazel-team): we currently have undocumented methods on undocumented data
-          // structures, namely java.util.List. Remove this case when we are done.
-          Preconditions.checkState(!skylarkSignature.documented());
-          Preconditions.checkState(moduleClass == List.class);
-        } else {
-          if (!modules.containsKey(skylarkModule.name())) {
-            modules.put(skylarkModule.name(), new SkylarkModuleDoc(skylarkModule, moduleClass));
-          }
-          SkylarkModuleDoc module = modules.get(skylarkModule.name());
-          module.addMethod(new SkylarkBuiltinMethodDoc(module, skylarkSignature, field.getType()));
+        Preconditions.checkNotNull(skylarkModule);
+        if (!modules.containsKey(skylarkModule.name())) {
+          modules.put(skylarkModule.name(), new SkylarkModuleDoc(skylarkModule, moduleClass));
         }
+        SkylarkModuleDoc module = modules.get(skylarkModule.name());
+        module.addMethod(new SkylarkBuiltinMethodDoc(module, skylarkSignature, field.getType()));
       }
     }
   }