attempt to restore the upstream history