diff --git a/a10/device.mk b/a10/device.mk
index d1d704b..3e26541 100644
--- a/a10/device.mk
+++ b/a10/device.mk
@@ -7,9 +7,6 @@ $(call inherit-product, vendor/samsung/a10-arm64/a10-vendor.mk)
 
 $(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk)
 
-PRODUCT_PACKAGES += \
-    CameraLightSensor
-
 # USB
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.0-service.a10
diff --git a/a20/device.mk b/a20/device.mk
index e2a1e6b..ed14934 100644
--- a/a20/device.mk
+++ b/a20/device.mk
@@ -10,9 +10,6 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk)
 # Derp
 DERP_BUILDTYPE := Official
 
-PRODUCT_PACKAGES += \
-    CameraLightSensor
-    
 # USB
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.1-service.exynos7885
diff --git a/a20e/device.mk b/a20e/device.mk
index bf9e8b0..3b56dcc 100644
--- a/a20e/device.mk
+++ b/a20e/device.mk
@@ -10,9 +10,6 @@ $(call inherit-product, frameworks/native/build/phone-xhdpi-4096-dalvik-heap.mk)
 # Derp
 DERP_BUILDTYPE := Official
 
-PRODUCT_PACKAGES += \
-    CameraLightSensor
-
 # USB
 PRODUCT_PACKAGES += \
     android.hardware.usb@1.1-service.exynos7885
diff --git a/a30/overlay/frameworks/base/core/res/res/values/config.xml b/a30/overlay/frameworks/base/core/res/res/values/config.xml
index 6134038..a5ba879 100644
--- a/a30/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a30/overlay/frameworks/base/core/res/res/values/config.xml
@@ -66,6 +66,8 @@
     <!-- For performance and storage reasons, limit the number of fingerprints per user -->
     <integer name="config_fingerprintMaxTemplatesPerUser">4</integer>
 
+    <bool name="config_automatic_brightness_available">true</bool>
+
     <!-- Specify if the fingerprint hardware support gestures-->
     <bool name="config_fingerprintSupportsGestures">true</bool>
 
diff --git a/a40/overlay/frameworks/base/core/res/res/values/config.xml b/a40/overlay/frameworks/base/core/res/res/values/config.xml
index 6134038..15870cb 100644
--- a/a40/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a40/overlay/frameworks/base/core/res/res/values/config.xml
@@ -51,6 +51,8 @@
          will not debounce light sensor readings -->
     <integer name="config_lightSensorWarmupTime">200</integer>
 
+    <bool name="config_automatic_brightness_available">true</bool>
+
     <!-- The type of the light sensor to be used by the display framework for things like
          auto-brightness. If unset, then it just gets the default sensor of type TYPE_LIGHT. -->
     <string name="config_displayLightSensorType">com.samsung.sensor.physical_light</string>
diff --git a/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml b/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
index 12253f0..51b4b09 100644
--- a/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/universal7885-common/overlay/frameworks/base/core/res/res/values/config.xml
@@ -134,7 +134,6 @@
          fading edges is prohibitively expensive on most GPUs. -->
     <bool name="config_ui_enableFadingMarquee">true</bool>
     
-    <bool name="config_automatic_brightness_available">true</bool>
     <integer name="config_autoBrightnessBrighteningLightDebounce">2000</integer>
     <integer name="config_autoBrightnessDarkeningLightDebounce">4000</integer>
     <integer-array name="config_autoBrightnessDisplayValuesNits">