Big TRDS 3.0 revert

This reverts commit efb1255768e5cceac53849157e3d6319da664c05.

This reverts commit 90f2e01a23976f5034730d23259236a08d7b013a.

This reverts commit 740d9e619811deb4145748828d441746e1b80fb3.

Change-Id: I0746c8c9c3bb48e47199cbdba773574f08d6c212