Revert "Squash 'enhance power efficiency' patches"

This reverts commit 68bd1e4b1cdea28ad6f9b32e257bd8be43683046.