Finally upgraded to the 4S. I did the restore from an iCloud backup, and it worked perfectly.