Revert "fb: TRDS some tweaks and fixes (1/2)"

This reverts commit 1ed9438736eba10f3ecbd0103a55e631bddc3826.