Revert "Squash 'enhance power efficiency' patches"

This reverts commit 361e0903918520ceccae63d71de36b8a4c0914cc.