Revert DT2S

This reverts commit 30e39554463d440b49d738ded2437ad37f3f04c1.
This reverts commit 52adc0f9cd74ff0512de46564d6e9a1f1b1ffa9b.