Revert "dt2w/s2w fix"

This reverts commit 4c8355609e735d036f81d4e1dee853a88beb9f7a.
dt2w/s2w fix again