diff --git a/src/com/google/doclava/SeeTagInfo.java b/src/com/google/doclava/SeeTagInfo.java
index eddc595..fee8ce2 100644
--- a/src/com/google/doclava/SeeTagInfo.java
+++ b/src/com/google/doclava/SeeTagInfo.java
@@ -35,16 +35,8 @@
 
   protected LinkReference linkReference() {
     if (mLink == null) {
-      // If this is a @see reference in frameworks/base, suppress errors about broken references.
-      // Outside of frameworks/base, and the generated android/R file, all such
-      // errors have been fixed, see b/80570421.
-      boolean suppressableSeeReference =
-          "@see".equals(name()) &&
-              (position().file.contains("frameworks/base/")
-                  || position().file.endsWith("android/R.java"));
-      mLink =
-          LinkReference.parse(text(), mBase, position(), !suppressableSeeReference
-              && (mBase != null ? mBase.checkLevel() : true));
+      mLink =  LinkReference.parse(text(), mBase, position(),
+          mBase != null ? mBase.checkLevel() : true);
     }
     return mLink;
   }
