Revert "Add unlocked Touchwake (20s by default)"

This reverts commit bd99203cecb923da8560a23e74a4f03177ac7b5c.