Revert "Updated s2w/dt2w/pd"

This reverts commit 4df90937e862f7403e651a3a7f31a29a01dcd9b6.