Revert "DO NOT MERGE: Fix up checksums instead of recalculating them."

This reverts commit 489e108988036facb25c59d59eb5250cf076fd3a.

Change-Id: I39e24afd8e9f1c862c0b7eea872c4fe31240aecf
6 files changed