Undo battery shenanigans. Sorry for the conflicts claire :v