I have an original iPhone 8GB with FW 2.1. I bought it with 2.0.1 unlocked and jailbroken. When 2.0.2 and 2.1 came out I updated through iTunes and lost the jailbreak. I wanted to give the jailbreak another try. I used Quickpawn to do it. But now my battery doesn't hold up even 12 hours. So I want to unjailbreak it but keep the unlock. How can I do it? Is there any way I can "update" the FW through iTunes from 2.1 to 2.1? PS: Without the jailbreak my battery lasted over 36 hours.