If you rooted and upgraded to the leaked GB, you'll want to SBF back to Froyo and not use the back-up image you created prior to flashing GB. If you restore a FROYO backup while running the GB leak you will boot-loop.
Check out the SBF thread for your particular model, and follow the steps. Once you're done you'll have a factory stock unrooted Droid on your hands ready to be sent back.