This reverts commit 1f630eaa.
One bug left, which uncovered shortcommings in 4 tests:
- 3 tests duplicate checksum computation code
- 1 test relies on previous tests not leaving garbage