Revert "fixes for battery saver mode"

This reverts commit b3a7e6a6b8dcd5508ef5dcc347d06ffc5d6e2378.