Revert "Revert "Revert "Squash 'enhance power efficiency' patches"""

This reverts commit 4276266278f9a5b58277d06184272cad8c88e24e.