Revert "Squash 'enhance power efficiency' patches"

This reverts commit 74b6cc4602cf6a838436f143ca7b10e9347aa85a.