Bring revisions #25342 - #25491 from revise_chunks to revise_chksum_retry.
Tested on jam, koala, ostrich, platypus.