diff --git a/src/third_party/jni_zero/BUILD.gn b/src/third_party/jni_zero/BUILD.gn
index e97d87adb0..99af79021b 100644
--- a/src/third_party/jni_zero/BUILD.gn
+++ b/src/third_party/jni_zero/BUILD.gn
@@ -50,9 +50,6 @@ component("jni_zero") {
     ":toolchain_define",
     ":jni_include_dir",
   ]
-
-  # Need to depend on the inner target to avoid a circular dependency.
-  deps = [ ":system_jni__action($default_toolchain)" ]
 }
 
 if (enable_java_templates && is_android) {
diff --git a/src/third_party/jni_zero/common_apis.cc b/src/third_party/jni_zero/common_apis.cc
index 48fd38f78d..d55d422433 100644
--- a/src/third_party/jni_zero/common_apis.cc
+++ b/src/third_party/jni_zero/common_apis.cc
@@ -4,20 +4,17 @@
 
 #include "third_party/jni_zero/common_apis.h"
 
-#include "third_party/jni_zero/system_jni/Arrays_jni.h"
-#include "third_party/jni_zero/system_jni/Collection_jni.h"
-
 namespace jni_zero {
 
 ScopedJavaLocalRef<jobjectArray> CollectionToArray(
     JNIEnv* env,
     const JavaRef<jobject>& collection) {
-  return JNI_Collection::Java_Collection_toArray(env, collection);
+  return nullptr;
 }
 
 ScopedJavaLocalRef<jobject> ArrayToList(JNIEnv* env,
                                         const JavaRef<jobjectArray>& array) {
-  return JNI_Arrays::Java_Arrays_asList(env, array);
+  return nullptr;
 }
 
 }  // namespace jni_zero