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

This reverts commit adf42ad4015dc4cb188acdcde20f16330d0679b0.