Revert "Forward port Clock Settings"

This reverts commit 3ede261d594014f39510b9399f281bf4c2bb8a23.