Restored clobbered changes