Revert "Switch from dashclock to lockclock"

This reverts commit 3f716e6af921939dd14059ce5402384a1a9b0d6e.