Revert "Remove cm clock code"

This reverts commit f27a244890f6ed8500a83c937dd1f55778a63d47.