Return to stock for warranty

view story

http://androidforums.com – Well here it is...I bought a second One-s and did Super CID and S-off - and in the course of using the phone I have been having lots of trouble with 4G. T-mobile sent a replacement they say it is a hardware issue, so now I am the one that gets to ask the questions about returning this device to stock for warranty replacement. I am assuming that I do the process in reverse. IE: S-on, then back to T-MOBO10 CID then set the lock flag. is this correct? Is there things I should be careful of? Should I run the 2.35 ruu that the phone was on before? (I ran 3.14 after s-off) (General)