Bring revision #25309 from revise_chunks to revise_chksum_retry.
Tested on jam, koala, ostrich, platypus, quail.