Revert Merge branch 751-archive-reader-performance

This reverts commit 2da5456d, reversing
changes made to a1976720.
15 jobs for 747-revert-mr in 33 minutes and 53 seconds (queued for 4 seconds)