Revert "Squash 'enhance power efficiency' patches"

This reverts commit 5b615096e705ea1e314d2ad37725325ace72f2cd.

Change-Id: I49b5e2d6c00ff5623fd6034a1c3b246e820270d3