diff --git a/src/com/android/settings/TetherService.java b/src/com/android/settings/TetherService.java
index 95b8462..9176d44 100644
--- a/src/com/android/settings/TetherService.java
+++ b/src/com/android/settings/TetherService.java
@@ -29,7 +29,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.os.IBinder;
 import android.os.ResultReceiver;
@@ -236,16 +235,6 @@
             intent.putExtra(TETHER_CHOICE, type);
             intent.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
 
-            // Ensure that the provisioning app will actually handle the intent.
-            final PackageManager packageManager = getPackageManager();
-            if (packageManager.queryBroadcastReceivers(
-                    intent, PackageManager.MATCH_DEFAULT_ONLY).isEmpty()) {
-                Log.e(TAG, "Provisioning app is configured, but not available.");
-                fireCallbacksForType(type, ConnectivityManager.TETHER_ERROR_PROVISION_FAILED);
-                removeTypeAtIndex(index);
-                return;
-            }
-
             sendBroadcast(intent);
             mInProvisionCheck = true;
         }
