Revert a couple commits ago.. breaks s2w