Revert "Revert "Bring us some Touch Wake.""

This reverts commit dd42bc7345760940af98b8efc6c206259df286ec.