diff --git a/config/common_full.mk b/config/common_full.mk
index 51c39233..22d25e15 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -17,8 +17,7 @@ PRODUCT_PACKAGES += \
     PhotoTable \
     SoundRecorder \
     PhotoPhase \
-    CMSettingsProvider \
-    CMResolver
+    CMSettingsProvider
 
 # Extra tools in CM
 PRODUCT_PACKAGES += \
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index e0e529a9..85f72dd4 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -76,5 +76,5 @@
     </string-array>
 
     <!-- Enable custom resolver, so we can supply suggestions if nothing can handle the intent -->
-    <string name="config_customResolverActivity">org.cyanogenmod.resolver/org.cyanogenmod.resolver.ResolverActivity</string>
+    <string name="config_customResolverActivity"></string>
 </resources>