revert: sweep2wake and double2wake

Change-Id: I3cd124d6b49fc4d7dc2621ae13fc2d5d99f7d1df