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

This reverts commit f9f21af1f4616c814582faf8b4a4f09c2bf4669f.