Revert Base jni commit