Help! Can I re-virginize an iPhone which was not unlocked- just activated/jailbroken?

[zub3qin]

Great forum- but I have searched and can't find a clear answer on this.

I have an iPhone that is activated with Independence and is running 1.1.1. I never used it as a phone, just as an iPod/web device.

I never unlocked it BUT it is jailbroken.

I want to restore it to a factory state so it can be used on AT&T like it was fresh out of the box.

How do i do this?
Is it as simple as upgrading to 1.1.4 like iTunes asks me to? Then is the phone back to a factory state?

Thanks SO much!

[schneiderman]

then just restore with itunes.. it will relock your phone and wipe everything out