If worse come to worst, could you just grab the private key from the debug console and re-import it on a fresh install? I mean, obviously  try it first to make sure you can do that, but I feel like it would work.