Fix clobbered changes.