Revert "clock"

This reverts commit 4f385c03460769ba613119c4ca22249a0d2ee1f8.
Revert "Revert "clock""

This reverts commit fffd6ca0654f37cbaa1fd01f286520a00d7e0dd1.