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

This reverts commit 7a0d264419097b5301ce791cf253edd0cc91e42f.
fix build