Revert "Battery Saver Stuff"

This reverts commit c937b422a79b940848a1c94f18d20e0f961ede8f.