Revert change, add fix to CSVReader and test