Revert "Some power management tweaks from Code Aurora"

This reverts commit e5af4042b74fefebcf8dd55a479ec87cd0c531bf.