Revert "Port dt2wake and sweep2wake: TEST!"

This reverts commit 9e4c72cf2c65fc209682ea144fbc113e4fdafe8e.