Revert "Squash 'enhance power efficiency' patches"

This reverts commit ad23361f7601a8b8c1e5082514fd5e3a8e0c6e61.