Revert "Battery fixes final try"

This reverts commit f34200f9140f36199dfc8a67855210de18b5366e.