diff --git a/api/cm_current.txt b/api/cm_current.txt
index 7f84803..2f58cd2 100644
--- a/api/cm_current.txt
+++ b/api/cm_current.txt
@@ -512,7 +512,7 @@ package cyanogenmod.hardware {
     field public static final int FEATURE_PICTURE_ADJUSTMENT = 262144; // 0x40000
     field public static final int FEATURE_SERIAL_NUMBER = 128; // 0x80
     field public static final int FEATURE_SUNLIGHT_ENHANCEMENT = 256; // 0x100
-    field public static final int FEATURE_TAP_TO_WAKE = 512; // 0x200
+    field public static final deprecated int FEATURE_TAP_TO_WAKE = 512; // 0x200
     field public static final int FEATURE_THERMAL_MONITOR = 32768; // 0x8000
     field public static final int FEATURE_TOUCH_HOVERING = 2048; // 0x800
     field public static final int FEATURE_UNIQUE_DEVICE_ID = 65536; // 0x10000
diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMHardwareService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMHardwareService.java
index bd9071b..e13a87a 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMHardwareService.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMHardwareService.java
@@ -53,7 +53,6 @@ import org.cyanogenmod.hardware.PersistentStorage;
 import org.cyanogenmod.hardware.PictureAdjustment;
 import org.cyanogenmod.hardware.SerialNumber;
 import org.cyanogenmod.hardware.SunlightEnhancement;
-import org.cyanogenmod.hardware.TapToWake;
 import org.cyanogenmod.hardware.ThermalMonitor;
 import org.cyanogenmod.hardware.ThermalUpdateCallback;
 import org.cyanogenmod.hardware.TouchscreenHovering;
@@ -142,8 +141,6 @@ public class CMHardwareService extends CMSystemService implements ThermalUpdateC
                 mSupportedFeatures |= CMHardwareManager.FEATURE_SERIAL_NUMBER;
             if (SunlightEnhancement.isSupported())
                 mSupportedFeatures |= CMHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT;
-            if (TapToWake.isSupported())
-                mSupportedFeatures |= CMHardwareManager.FEATURE_TAP_TO_WAKE;
             if (VibratorHW.isSupported())
                 mSupportedFeatures |= CMHardwareManager.FEATURE_VIBRATOR;
             if (TouchscreenHovering.isSupported())
@@ -180,8 +177,6 @@ public class CMHardwareService extends CMSystemService implements ThermalUpdateC
                     return KeyDisabler.isActive();
                 case CMHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT:
                     return SunlightEnhancement.isEnabled();
-                case CMHardwareManager.FEATURE_TAP_TO_WAKE:
-                    return TapToWake.isEnabled();
                 case CMHardwareManager.FEATURE_TOUCH_HOVERING:
                     return TouchscreenHovering.isEnabled();
                 case CMHardwareManager.FEATURE_AUTO_CONTRAST:
@@ -206,8 +201,6 @@ public class CMHardwareService extends CMSystemService implements ThermalUpdateC
                     return KeyDisabler.setActive(enable);
                 case CMHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT:
                     return SunlightEnhancement.setEnabled(enable);
-                case CMHardwareManager.FEATURE_TAP_TO_WAKE:
-                    return TapToWake.setEnabled(enable);
                 case CMHardwareManager.FEATURE_TOUCH_HOVERING:
                     return TouchscreenHovering.setEnabled(enable);
                 case CMHardwareManager.FEATURE_AUTO_CONTRAST:
diff --git a/sdk/src/java/cyanogenmod/hardware/CMHardwareManager.java b/sdk/src/java/cyanogenmod/hardware/CMHardwareManager.java
index 5f60443..cc6a82a 100644
--- a/sdk/src/java/cyanogenmod/hardware/CMHardwareManager.java
+++ b/sdk/src/java/cyanogenmod/hardware/CMHardwareManager.java
@@ -93,7 +93,10 @@ public final class CMHardwareManager {
 
     /**
      * Double-tap the touch panel to wake up the device
+     *
+     * @deprecated This functionality is replaced by AOSP's implementation as of CM 13.0.
      */
+    @Deprecated
     public static final int FEATURE_TAP_TO_WAKE = 0x200;
 
     /**
@@ -148,7 +151,6 @@ public final class CMHardwareManager {
         FEATURE_HIGH_TOUCH_SENSITIVITY,
         FEATURE_KEY_DISABLE,
         FEATURE_SUNLIGHT_ENHANCEMENT,
-        FEATURE_TAP_TO_WAKE,
         FEATURE_TOUCH_HOVERING,
         FEATURE_AUTO_CONTRAST,
         FEATURE_THERMAL_MONITOR
diff --git a/system-api/cm_system-current.txt b/system-api/cm_system-current.txt
index 7f84803..2f58cd2 100644
--- a/system-api/cm_system-current.txt
+++ b/system-api/cm_system-current.txt
@@ -512,7 +512,7 @@ package cyanogenmod.hardware {
     field public static final int FEATURE_PICTURE_ADJUSTMENT = 262144; // 0x40000
     field public static final int FEATURE_SERIAL_NUMBER = 128; // 0x80
     field public static final int FEATURE_SUNLIGHT_ENHANCEMENT = 256; // 0x100
-    field public static final int FEATURE_TAP_TO_WAKE = 512; // 0x200
+    field public static final deprecated int FEATURE_TAP_TO_WAKE = 512; // 0x200
     field public static final int FEATURE_THERMAL_MONITOR = 32768; // 0x8000
     field public static final int FEATURE_TOUCH_HOVERING = 2048; // 0x800
     field public static final int FEATURE_UNIQUE_DEVICE_ID = 65536; // 0x10000
diff --git a/tests/src/org/cyanogenmod/tests/hardware/CMHardwareTest.java b/tests/src/org/cyanogenmod/tests/hardware/CMHardwareTest.java
index a65f632..dc77c60 100644
--- a/tests/src/org/cyanogenmod/tests/hardware/CMHardwareTest.java
+++ b/tests/src/org/cyanogenmod/tests/hardware/CMHardwareTest.java
@@ -44,7 +44,6 @@ public class CMHardwareTest extends TestActivity {
             CMHardwareManager.FEATURE_LONG_TERM_ORBITS,
             CMHardwareManager.FEATURE_SERIAL_NUMBER,
             CMHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT,
-            CMHardwareManager.FEATURE_TAP_TO_WAKE,
             CMHardwareManager.FEATURE_TOUCH_HOVERING,
             CMHardwareManager.FEATURE_AUTO_CONTRAST,
             CMHardwareManager.FEATURE_DISPLAY_MODES,
@@ -57,7 +56,6 @@ public class CMHardwareTest extends TestActivity {
             CMHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY,
             CMHardwareManager.FEATURE_KEY_DISABLE,
             CMHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT,
-            CMHardwareManager.FEATURE_TAP_TO_WAKE,
             CMHardwareManager.FEATURE_TOUCH_HOVERING,
             CMHardwareManager.FEATURE_AUTO_CONTRAST
     );