Bring revisions #25826 - #25828 from revise_chunks to revise_chksum_retry.
Tested on jam, koala, ostrich.