Revert "Touchwake updates"

This reverts commit 0f6ab97219d506e431023758e5a41c8b4f33de12.

Change-Id: I86946148ee6cf3b3b75ab81ac43fb3edc751c268