Recreating repo from upstream too much munged in the merge