Revert "Enable S2W & DT2W by default"

This reverts commit 56ea007aa3203c578f7c575be484e9017e1415d2.