Revert "TRDS 2.0 (1/3)"

This reverts commit 48e3ca479ef3d30a5a1deefd3809169bca252486.
Revert "TRDS new qualifier push up qualifier number (1/2)"

This reverts commit 182beb4cfe7f1ef61ccd310e126de4ecbba77efa.
Revert "Revert "TRDS new qualifier push up qualifier number (1/2)""

This reverts commit 767a590f3ee7a213d218f420ae9e3063fddf2e3c.