Revert "Remove LockClock settings"

I changed my mind

This reverts commit 443c89e7954538e0a113244e71504b7e70c09f39.