So the official 2.1 OTA for the Eris has started being rolled out today. I'm on the leaked firmware now, will I ever see the OTA? If not, how can I reset my phone so I can get the official? Please help! I'd really like the legit firmware. BTW, it's not rooted.