Reverting some of the changes for cross reporting