Revert "Squash 'enhance power efficiency' patches"

This reverts commit 139f73869bc59aa465c2e108ff4d76f3ddfb5a57.