battery: revert most changes from de4c6d0