Revert "making s2w a bit easier to trigger"

This reverts commit 9cdc0da4d298edc76f6d84c9268cd30c1ea887f5.