diff --git a/tools/java/com/google/j2cl/tools/rta/RapidTypeAnalyser.java b/tools/java/com/google/j2cl/tools/rta/RapidTypeAnalyser.java
index 8cfd08cc97..6b6ebd0c33 100644
--- a/tools/java/com/google/j2cl/tools/rta/RapidTypeAnalyser.java
+++ b/tools/java/com/google/j2cl/tools/rta/RapidTypeAnalyser.java
@@ -83,11 +83,10 @@ private void markMemberLive(Member member) {
   }
 
   private void unfoldPolymorphicReference(Member member) {
-    // Set of types inheriting this member
+    // Set of types inheriting this member (includes the enclosing type of the member).
     Set<Type> inheritingTypes = typeHierarchyGraph.getTypesInheriting(member);
-    // TODO(b/112859205): Some static references ($clinit or static fields or unknown members) are
-    // flagged as dynamic references. Remove inheritingTypes.isEmpty() when it solved.
-    if (inheritingTypes.isEmpty() || containsLiveTypes(inheritingTypes)) {
+
+    if (containsLiveTypes(inheritingTypes)) {
       markMemberLive(member);
     } else {
       // none of the possible types for this member is live. Register this member,