Revert changes that broke measures2csv.