Revert "Battery Saver fixes take 2"

This reverts commit e5152eb76ca3fdadded57c27596c329c49dcd451.