Revert "Lock Clock: Refactor to Chronus (2 of 4)"

This reverts commit 311567f57613e9c79a14366f1443c409b3a20ac1.