Revert "Update s2w"

This reverts commit 6f771395b802d308bea01e3d24b7a2320f52cf7e.