Fix merge conflict with bug 1043802.