Yes, you need the stock RUU. When you reflash your phone if will be back to the basic recovery and Android 2.1 that came with the phone. Check out XDA developers forums and follow these directions:
I would suggest you at least download and store that RUU installer somewhere handy, because come the 1st of July it will not be available on his website due to HTC serving a cease and desist order for sharing it. (This could change after he talks to their lawyer hopefully sometime next month.)