diff --git a/config/common.mk b/config/common.mk
index a385b4f0..06b0912d 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -108,10 +108,6 @@ PRODUCT_COPY_FILES += \
     vendor/cm/prebuilt/common/bin/compcache:system/bin/compcache \
     vendor/cm/prebuilt/common/bin/handle_compcache:system/bin/handle_compcache
 
-# block stock OTAs
-PRODUCT_COPY_FILES += \
-    vendor/cm/prebuilt/common/bin/otablock:system/bin/otablock
-
 # Terminal Emulator
 PRODUCT_COPY_FILES +=  \
     vendor/cm/proprietary/Term.apk:system/app/Term.apk \
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 4600e222..9ce3a747 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -19,5 +19,11 @@
 
     <bool name="config_cellBroadcastAppLinks">true</bool>
 
+    <!-- Disable stock OTA components if installed -->
+    <string-array name="config_disabledComponents" translatable="false">
+        <item>com.google.android.gsf/com.google.android.gsf.update.SystemUpdateActivity</item>
+        <item>com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService</item>
+        <item>com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService$Receiver</item>
+    </string-array>
 </resources>
 
diff --git a/prebuilt/common/bin/otablock b/prebuilt/common/bin/otablock
deleted file mode 100644
index 62dbd1be..00000000
--- a/prebuilt/common/bin/otablock
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/system/bin/sh
-
-
-## If these activities are installed, get rid of them. We don't want updates
-## coming in from outside CM
-
-exec 2>/dev/null
-pm disable com.google.android.gsf/com.google.android.gsf.update.SystemUpdateActivity
-pm disable com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService
-pm disable com.google.android.gsf/com.google.android.gsf.update.SystemUpdateService\$Receiver
diff --git a/prebuilt/common/etc/init.local.rc b/prebuilt/common/etc/init.local.rc
index 5e341879..d62c1c24 100644
--- a/prebuilt/common/etc/init.local.rc
+++ b/prebuilt/common/etc/init.local.rc
@@ -48,12 +48,3 @@ service sysinit /system/bin/sysinit
     user root
     oneshot
     disabled
-
-# Block stock OTA activities
-service otablock /system/bin/otablock
-    user root
-    oneshot
-    disabled
-
-on property:dev.bootcomplete=1
-    start otablock