diff --git a/conf/init.lynx.rc b/conf/init.lynx.rc
index 2bdf3ab..97bf4d7 100644
--- a/conf/init.lynx.rc
+++ b/conf/init.lynx.rc
@@ -110,13 +110,6 @@ on override-sf-uclamp
 on property:ro.boot.hardware.sku=G82U8
     setprop audio.camerasound.force true
 
-# Route vibrator.adaptive_haptics.enabled to persist
-on property:vibrator.adaptive_haptics.enabled=0
-    setprop persist.vendor.vibrator.hal.context.enable false
-
-on property:vibrator.adaptive_haptics.enabled=1
-    setprop persist.vendor.vibrator.hal.context.enable true
-
 # Haptics
 on property:vendor.all.modules.ready=1
     mkdir /mnt/vendor/persist/haptics 0770 system system
diff --git a/device-lynx.mk b/device-lynx.mk
index 24f8e8c..6db2aa4 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -28,7 +28,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/lynx/lynx/overlay
 
 include device/google/lynx/audio/lynx/audio-tables.mk
 include device/google/gs201/device-shipping-common.mk
-include device/google/lynx/vibrator/cs40l26/device.mk
+include hardware/google/pixel/vibrator/cs40l26/device.mk
 include device/google/gs-common/touch/gti/gti.mk
 
 # go/lyric-soong-variables