diff --git a/app/shared/src/main/AndroidManifest.xml b/app/shared/src/main/AndroidManifest.xml
index f8862c7f7..79cd798f9 100644
--- a/app/shared/src/main/AndroidManifest.xml
+++ b/app/shared/src/main/AndroidManifest.xml
@@ -12,12 +12,6 @@
         android:supportsRtl="true"
         android:theme="@android:style/Theme.Translucent.NoTitleBar"
         tools:ignore="UnusedAttribute">
-
-        <provider
-            android:name="a.p"
-            android:authorities="${applicationId}.provider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-        </provider>
     </application>
+
 </manifest>
diff --git a/app/shared/src/main/java/a/p.java b/app/shared/src/main/java/a/p.java
deleted file mode 100644
index 5cfd5256c..000000000
--- a/app/shared/src/main/java/a/p.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package a;
-
-import com.topjohnwu.magisk.FileProvider;
-
-public class p extends FileProvider {
-    /* Stub */
-}
diff --git a/app/shared/src/main/java/com/topjohnwu/magisk/FileProvider.java b/app/shared/src/main/java/com/topjohnwu/magisk/FileProvider.java
index e8bc9aaf4..5f8bf5d37 100644
--- a/app/shared/src/main/java/com/topjohnwu/magisk/FileProvider.java
+++ b/app/shared/src/main/java/com/topjohnwu/magisk/FileProvider.java
@@ -8,7 +8,6 @@ import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.Environment;
 import android.os.ParcelFileDescriptor;
 import android.provider.OpenableColumns;
@@ -34,8 +33,6 @@ public class FileProvider extends ContentProvider {
 
     private PathStrategy mStrategy;
 
-    public static ProviderCallHandler callHandler;
-
     @Override
     public boolean onCreate() {
         return true;
@@ -131,13 +128,6 @@ public class FileProvider extends ContentProvider {
         return file.delete() ? 1 : 0;
     }
 
-    @Override
-    public Bundle call(String method, String arg, Bundle extras) {
-        if (callHandler != null)
-            return callHandler.call(getContext(), method, arg, extras);
-        return Bundle.EMPTY;
-    }
-
     @Override
     public ParcelFileDescriptor openFile(Uri uri, String mode)
             throws FileNotFoundException {
diff --git a/app/shared/src/main/java/com/topjohnwu/magisk/ProviderCallHandler.java b/app/shared/src/main/java/com/topjohnwu/magisk/ProviderCallHandler.java
deleted file mode 100644
index c3ff5c447..000000000
--- a/app/shared/src/main/java/com/topjohnwu/magisk/ProviderCallHandler.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.topjohnwu.magisk;
-
-import android.content.Context;
-import android.os.Bundle;
-
-public interface ProviderCallHandler {
-    Bundle call(Context context, String method, String arg, Bundle extras);
-}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3a493af31..c44913ea7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -65,6 +65,14 @@
         <!-- DownloadService -->
         <service android:name="a.j" />
 
+        <!-- FileProvider -->
+        <provider
+            android:name="a.p"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+        </provider>
+
         <!-- Hardcode GMS version -->
         <meta-data
             android:name="com.google.android.gms.version"
diff --git a/app/src/main/java/a/stubs.kt b/app/src/main/java/a/stubs.kt
index a7c62d49a..5a85aabb0 100644
--- a/app/src/main/java/a/stubs.kt
+++ b/app/src/main/java/a/stubs.kt
@@ -2,7 +2,8 @@
 package a
 
 import com.topjohnwu.magisk.core.App
-import com.topjohnwu.magisk.core.GeneralReceiver
+import com.topjohnwu.magisk.core.Provider
+import com.topjohnwu.magisk.core.Receiver
 import com.topjohnwu.magisk.core.SplashActivity
 import com.topjohnwu.magisk.core.download.DownloadService
 import com.topjohnwu.magisk.ui.MainActivity
@@ -22,8 +23,10 @@ class e : App {
     constructor(o: Any) : super(o)
 }
 
-class h : GeneralReceiver()
+class h : Receiver()
 
 class j : DownloadService()
 
 class m : SuRequestActivity()
+
+class p : Provider()
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/App.kt b/app/src/main/java/com/topjohnwu/magisk/core/App.kt
index 617214f5d..fed406a5a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/App.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/App.kt
@@ -10,8 +10,6 @@ import androidx.multidex.MultiDex
 import androidx.work.WorkManager
 import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.DynAPK
-import com.topjohnwu.magisk.FileProvider
-import com.topjohnwu.magisk.core.su.SuCallbackHandler
 import com.topjohnwu.magisk.core.utils.IODispatcherExecutor
 import com.topjohnwu.magisk.core.utils.RootInit
 import com.topjohnwu.magisk.core.utils.updateConfig
@@ -36,7 +34,6 @@ open class App() : Application() {
             .setInitializers(RootInit::class.java)
             .setTimeout(2))
         Shell.EXECUTOR = IODispatcherExecutor()
-        FileProvider.callHandler = SuCallbackHandler
 
         // Always log full stack trace with Timber
         Timber.plant(Timber.DebugTree())
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt b/app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt
index c1c9a16c8..1b0eed799 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/Hacks.kt
@@ -149,7 +149,7 @@ private object ClassMap {
         App::class.java to a.e::class.java,
         MainActivity::class.java to a.b::class.java,
         SplashActivity::class.java to a.c::class.java,
-        GeneralReceiver::class.java to a.h::class.java,
+        Receiver::class.java to a.h::class.java,
         DownloadService::class.java to a.j::class.java,
         SuRequestActivity::class.java to a.m::class.java
     )
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/Provider.kt b/app/src/main/java/com/topjohnwu/magisk/core/Provider.kt
new file mode 100644
index 000000000..2149d6043
--- /dev/null
+++ b/app/src/main/java/com/topjohnwu/magisk/core/Provider.kt
@@ -0,0 +1,19 @@
+package com.topjohnwu.magisk.core
+
+import android.content.Context
+import android.content.pm.ProviderInfo
+import android.os.Bundle
+import com.topjohnwu.magisk.FileProvider
+import com.topjohnwu.magisk.core.su.SuCallbackHandler
+
+open class Provider : FileProvider() {
+
+    override fun attachInfo(context: Context, info: ProviderInfo?) {
+        super.attachInfo(context.wrap(), info)
+    }
+
+    override fun call(method: String, arg: String?, extras: Bundle?): Bundle? {
+        SuCallbackHandler(context!!, method, extras)
+        return Bundle.EMPTY
+    }
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/GeneralReceiver.kt b/app/src/main/java/com/topjohnwu/magisk/core/Receiver.kt
similarity index 96%
rename from app/src/main/java/com/topjohnwu/magisk/core/GeneralReceiver.kt
rename to app/src/main/java/com/topjohnwu/magisk/core/Receiver.kt
index 5f2265520..9d0c662fe 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/GeneralReceiver.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/Receiver.kt
@@ -11,7 +11,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import org.koin.core.inject
 
-open class GeneralReceiver : BaseReceiver() {
+open class Receiver : BaseReceiver() {
 
     private val policyDB: PolicyDao by inject()
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt b/app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt
index 0198e0cef..7663f53d8 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/su/SuCallbackHandler.kt
@@ -7,14 +7,12 @@ import android.os.Bundle
 import android.os.Process
 import android.widget.Toast
 import com.topjohnwu.magisk.BuildConfig
-import com.topjohnwu.magisk.ProviderCallHandler
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.core.Config
 import com.topjohnwu.magisk.core.intent
 import com.topjohnwu.magisk.core.model.su.SuPolicy
 import com.topjohnwu.magisk.core.model.su.toLog
 import com.topjohnwu.magisk.core.model.su.toPolicy
-import com.topjohnwu.magisk.core.wrap
 import com.topjohnwu.magisk.data.repository.LogRepository
 import com.topjohnwu.magisk.ktx.get
 import com.topjohnwu.magisk.ktx.startActivity
@@ -26,18 +24,13 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
-object SuCallbackHandler : ProviderCallHandler {
+object SuCallbackHandler {
 
     const val REQUEST = "request"
     const val LOG = "log"
     const val NOTIFY = "notify"
     const val TEST = "test"
 
-    override fun call(context: Context, method: String, arg: String?, extras: Bundle?): Bundle? {
-        invoke(context.wrap(), method, extras)
-        return Bundle.EMPTY
-    }
-
     operator fun invoke(context: Context, action: String?, data: Bundle?) {
         data ?: return
 
diff --git a/stub/src/main/AndroidManifest.xml b/stub/src/main/AndroidManifest.xml
index 0c433ab3b..736e4b7b2 100644
--- a/stub/src/main/AndroidManifest.xml
+++ b/stub/src/main/AndroidManifest.xml
@@ -10,13 +10,20 @@
         android:allowBackup="true"
         tools:ignore="AllowBackup">
 
-        <activity android:name="a.a">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
+        <provider
+            android:name=".FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+        </provider>
+
     </application>
 
 </manifest>
diff --git a/stub/src/main/java/a/a.java b/stub/src/main/java/a/a.java
deleted file mode 100644
index c3f431e83..000000000
--- a/stub/src/main/java/a/a.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package a;
-
-import com.topjohnwu.magisk.MainActivity;
-
-public class a extends MainActivity {
-}