I have a 3GS running 5.01 with bb 6.15. It is unlocked with ultra snow. I have managed to get Apple to officially unlock the phone but as the bb is non standard it won't accept the unlock when I restore with iTunes. I get a no sim is in the phone when I try to activate. If I upgrade to 5.1 via iTunes will the baseband firmware also be restored at the same time and the iPhone returned to a non jail broken state.