Re-work the report download steps.