Redo upstream changes