Merge "Revert "DO NOT MERGE: Fix up checksums instead of recalculating them."" into klp-dev