Put back several merge revisions that were lost in r402054