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