battery: Moar changes (when will it end?)

This reverts commit 33e2c44807e4fadb968333ad8becbc6ebe711cd6.