Revert "TRDS 2.0 (3/3)"

This reverts commit b9a6edb329b69939769773aa6b1a0e79d46463f2.