Revert TRDS stuff