cae056f219
am: f4ee1720f3
* commit 'f4ee1720f33a01518f79a2bf8df4664dab3564d4':
Fix integer overflows in recovery procedure.