Put back the bits that got clobbered in my conflict resolution.