Revert "Squash 'enhance power efficiency' patches"

This reverts commit 10822ad0fd6e80002d0e164845c3f1182b00f373.