Bring back s2w toggle

Change-Id: I0b1b1c208c24dc6990b509a357eb0fe4f5a5858e