Restoring diffs, part II.