Backing out rest of report.c changes