1 files changed, 1 insertions, 2 deletions
diff --git a/java/com/google/devtools/build/android/desugar/CoreLibraryInvocationRewriter.java b/java/com/google/devtools/build/android/desugar/CoreLibraryInvocationRewriter.java
index fb62219..0e0610f 100644
--- a/java/com/google/devtools/build/android/desugar/CoreLibraryInvocationRewriter.java
+++ b/java/com/google/devtools/build/android/desugar/CoreLibraryInvocationRewriter.java
@@ -79,8 +79,7 @@ public class CoreLibraryInvocationRewriter extends ClassVisitor {
           checkArgument(itf, "Expected interface to rewrite %s.%s : %s", owner, name, desc);
           owner = InterfaceDesugaring.getCompanionClassName(coreInterfaceName);
         } else {
-          // TODO(kmb): Simulate dynamic dispatch instead of calling most general default method
-          owner = InterfaceDesugaring.getCompanionClassName(coreInterfaceName);
+          owner = coreInterfaceName + "$$Dispatch";
         }
 
         opcode = Opcodes.INVOKESTATIC;