Revert "More Touch Wake Test Stuff."-For now.

This reverts commit 99d1de89e2e0ec7c9d94946b1ab13a40d40ecb55.