diffs for bug #402079