1 files changed, 3 insertions, 5 deletions
diff --git a/java/com/google/devtools/build/android/desugar/ClassReaderFactory.java b/java/com/google/devtools/build/android/desugar/ClassReaderFactory.java
index 6ec4e0d..d324723 100644
--- a/java/com/google/devtools/build/android/desugar/ClassReaderFactory.java
+++ b/java/com/google/devtools/build/android/desugar/ClassReaderFactory.java
@@ -22,11 +22,9 @@ import org.objectweb.asm.ClassReader;
 
 class ClassReaderFactory {
   private final ZipFile jar;
-  private final CoreLibraryRewriter rewriter;
 
-  public ClassReaderFactory(ZipFile jar, CoreLibraryRewriter rewriter) {
+  public ClassReaderFactory(ZipFile jar) {
     this.jar = jar;
-    this.rewriter = rewriter;
   }
 
   /**
@@ -36,13 +34,13 @@ class ClassReaderFactory {
    */
   @Nullable
   public ClassReader readIfKnown(String internalClassName) {
-    ZipEntry entry = jar.getEntry(rewriter.unprefix(internalClassName) + ".class");
+    ZipEntry entry = jar.getEntry(internalClassName + ".class");
     if (entry == null) {
       return null;
     }
     try (InputStream bytecode = jar.getInputStream(entry)) {
       // ClassReader doesn't take ownership and instead eagerly reads the stream's contents
-      return rewriter.reader(bytecode);
+      return new ClassReader(bytecode);
     } catch (IOException e) {
       // We should've already read through all files in the Jar once at this point, so we don't
       // expect failures reading some files a second time.