am 12123e65: am 489e1089: (-s ours) DO NOT MERGE: Fix up checksums instead of recalculating them.

* commit '12123e65f97b732c7b408211c19b9d6f2ffd5ab4':
  DO NOT MERGE: Fix up checksums instead of recalculating them.