Bug 1049916 - fix merge conflict r=_6a68