Bring back first stash of upstream changes.