sync with strip_diff.