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

This reverts commit 3d049c70e8f45ef55162052785b47b1f943f7141.