Revert "TRDSNonintrusive 4/4"

This reverts commit 68f14ac4a3f1d8c36b3c11888b7bfc229f61c347.