Revert "An attempt to improve PowerHandler cpu usage"

This reverts commit e85d99b04729ea5351924dd9cea6f64faee47850.