Fix merge conflict with Bug 869836