Revert "Wake Gestures: various improvements and fixes"

This reverts commit 0ef1f8b1f369fd13aa5a4db1486b1e143dd76e08.