sweep2wake: revert previous s2w commit