[Q] Return to AT&T State for Warranty topic

I need to return my HTC One M7 back to its native AT&T state when purchased to claim on the warranty.

I found a link that seems to be what I need but would welcome confirmation of this being applicable. I have a rooted, S-Off, CID (all the ones 11111) and running the latest firmware with the latest radio too.

I assume that if I follow the guide I will be able to use a standard AT&T RUU and get the full firmware, radio and ROM back?

http://www.android.gs/unroot-htc-one...tock-jb-4-2-2/

Any advice would be most welcome.

Thanks