Updated for batteries 2.2

Patch not needed anymore, upstream works with 4.01 fine now