Fix the merge conflict of bug 958596 and bug 978776
Backed out changeset f32948046d7b (bug 978626) because this is not a clobber problem (on a CLOSED TREE)
Automatic merge