diff --git a/init-common.rc b/init-common.rc
index 3b6d4a4..167ceaa 100644
--- a/init-common.rc
+++ b/init-common.rc
@@ -55,19 +55,6 @@ service vendor.darkboot /vendor/bin/misc_writer --set-dark-theme --override-vend
     disabled
     oneshot
 
-# Clear the dark theme magic in /misc partition.
-service vendor.darkboot_clear --clear-dark-theme --override-vendor-space-offset 12360
-    disabled
-    oneshot
-
-# Set the dark boot flag on dark mode (UiModeManager.MODE_NIGHT_YES == 2).
-on property:persist.sys.theme=2
+# Set dark boot flag when the device is provisioned.
+on property:persist.sys.device_provisioned=1
     start vendor.darkboot
-
-# Clear the dark theme flag on light mode (UiModeManager.MODE_NIGHT_NO == 1) or auto mode
-# (UiModeManager.MODE_NIGHT_AUTO == 0).
-on property:persist.sys.theme=1
-    start vendor.darkboot_clear
-
-on property:persist.sys.theme=0
-    start vendor.darkboot_clear