Rebuild from coffee with just the coffee upgrade and no header changes.
Re-do our header changes in the coffee file where they belong.