Squashed revert of cpufreq updates