Revert "Fix some derps in the battery saver mode which got"

This reverts commit 083207018c6becc3104ae760be2f697448907a50.
Revert "[2/2] Squashed: Battery Saver mode"

This reverts commit d41f0e4e7f5c9ef9a6bbe5ee5d199abb24bf6171.