Revert "TRDS 2.0"

This reverts commit 6bbc750cc711dccf6b6d17966d243579dc44230c.