t5616: make robust to delta base change