Revert " Forward port Clock Settings"