Found this thread over at XDA... this will return your phone to stock like the day that you bought it. Yes, it will unroot it. Good luck.
http://http://forum.xda-developers.com/showthread.php?t=1167819
http://http://forum.xda-developers.com/showthread.php?t=1167819