Revert "Squash 'enhance power efficiency' patches"

This reverts commit a122b00d76e89246f1936f97c60c15bb072361bb.