fix broken incremental tar - merge from 2.2