Revert "Fix DT2W"

This reverts commit 5b5fbbaacede147629dfc0e166dd8e97fbe6cab0.