Revert "Squash 'enhance power efficiency' patches"

This reverts commit 12c1744c10f4c85241f667f73f5c271f5591c2b9.