Fixed bad conflict resolution in 645e9248.