Revert "Goodbye LockClock, Hello DashClock (3/3)"

This reverts commit b476fd5946679af18bbc6e267af8239115e2580d.