DT2W: Make DT2W independant of S2W

Change-Id: I7e7e486e4bd143cd8be65b71f39e914c6092788b