Do this in archive_random.c as we do in several other sources already.
Resolve conflicts by integrating changes from both sides.