This reverts merge request !386 (merged).
Reversion done due to roll out of the new archiver cluster.