diff --git a/init.common.diag.rc.user b/init.common.diag.rc.user
index efdd8f0c1..65f6a3bf2 100755
--- a/init.common.diag.rc.user
+++ b/init.common.diag.rc.user
@@ -2,6 +2,3 @@
 
 on property:ro.boot.mode=normal
     rm /dev/diag
-
-on boot
-    setprop persist.sys.usb.config diag,serial_cdev,serial_tty,rmnet_ipa,mass_storage
diff --git a/init.common.diag.rc.userdebug b/init.common.diag.rc.userdebug
index 831a9a23e..0aa4eb762 100644
--- a/init.common.diag.rc.userdebug
+++ b/init.common.diag.rc.userdebug
@@ -17,7 +17,6 @@ on post-fs-data
 
 on boot
     chmod 666 /dev/diag
-    setprop persist.sys.usb.config diag,serial_cdev,serial_tty,rmnet_ipa,mass_storage,adb
 
 on property:sys.usb.config=rndis,diag
      write /sys/class/android_usb/android0/enable 0