diff --git a/src/class_linker.cc b/src/class_linker.cc
index 3280410..4133a86 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -1346,9 +1346,6 @@
     }
     if (method->GetInvokeStub() == NULL) {
       method->SetInvokeStub(oat_method.GetInvokeStub());
-#if defined(ART_USE_LLVM_COMPILER)
-      method->SetProxyStub(oat_method.GetProxyStub());
-#endif
     }
   }
 }
@@ -2309,7 +2306,8 @@
 #if !defined(ART_USE_LLVM_COMPILER)
   method->SetCode(reinterpret_cast<void*>(art_proxy_invoke_handler));
 #else
-  method->SetCode(prototype->GetProxyStub());
+  OatFile::OatMethod oat_method = GetOatMethodFor(prototype.get());
+  method->SetCode(oat_method.GetProxyStub());
 #endif
 
   return method;