trying to get s2w working again

Signed-off-by: Bryan Smith <zarboz@gmail.com>