Revert DashClock TRDS stuff for now

Change-Id: Iccc7ef1b6f0fbcad1583fd9ff3eb9a11fdd74b6d