Think that I would have wanted to physically change the battery by now. What kernel were you using before as refer to "stock kernel" now and did you zeroise device before re-flashing?