As promised, undo my hamfisted attempts at fixing battery brokenness