Bug 852162 - Fix a bad resolution of a merge.