Revert "Update to use TRDS with the older TRDS configs"

This reverts commit 6b1b7b2f05267e8f6e3f3a610137b9bb8dee2bfa.