Revert "TDS"

This reverts commit 00debf7acf0cd377b40c592b8eac9e30c5ccf054.