Revert "Fix build error"

This reverts commit 3be0758a33dcb82c00a2fa91f02b09481f5fadce.
Revert "fb: TRDS some tweaks and fixes (1/2)"

This reverts commit 807ec7fa135501bf7244cbe409559fac046a3939.