Revert "TRDS 2.0 (1/3)"

This reverts commit 1dd5fca6c51d689d8e79ed1215a6f510fff12dcf.