diff --git a/src/main/java/com/android/tools/r8/D8.java b/src/main/java/com/android/tools/r8/D8.java
index 9b401a9..c40d755 100644
--- a/src/main/java/com/android/tools/r8/D8.java
+++ b/src/main/java/com/android/tools/r8/D8.java
@@ -257,7 +257,7 @@
               hasDexResources
                   ? NamingLens.getIdentityLens()
                   : PrefixRewritingNamingLens.createPrefixRewritingNamingLens(appView);
-          new GenericSignatureRewriter(appView.withLiveness(), namingLens)
+          new GenericSignatureRewriter(appView, namingLens)
               .run(appView.appInfo().classes(), executor);
         } else {
           // There are both cf and dex inputs in the program, and rewriting is required for
@@ -320,7 +320,7 @@
     ConvertedCfFiles convertedCfFiles = new ConvertedCfFiles();
     NamingLens prefixRewritingNamingLens =
         PrefixRewritingNamingLens.createPrefixRewritingNamingLens(appView);
-    new GenericSignatureRewriter(appView.withLiveness(), prefixRewritingNamingLens)
+    new GenericSignatureRewriter(appView, prefixRewritingNamingLens)
         .run(appView.appInfo().classes(), executor);
     new ApplicationWriter(
             cfApp,
diff --git a/src/main/java/com/android/tools/r8/R8.java b/src/main/java/com/android/tools/r8/R8.java
index 0b9c545..903e8b5 100644
--- a/src/main/java/com/android/tools/r8/R8.java
+++ b/src/main/java/com/android/tools/r8/R8.java
@@ -862,7 +862,7 @@
       NamingLens prefixRewritingNamingLens =
           PrefixRewritingNamingLens.createPrefixRewritingNamingLens(appView, namingLens);
 
-      new GenericSignatureRewriter(appView.withLiveness(), prefixRewritingNamingLens)
+      new GenericSignatureRewriter(appView, prefixRewritingNamingLens)
           .run(appView.appInfo().classes(), executorService);
 
       // Generate the resulting application resources.