am a24fc7c5: (-s ours) Merge "Revert "DO NOT MERGE: Fix up checksums instead of recalculating them."" into klp-dev

* commit 'a24fc7c545c22b0413fc324ecde96721b5a49b30':
  Revert "DO NOT MERGE: Fix up checksums instead of recalculating them."