Fix merge conflicts with bug 1015664.