Reverting changes to DataExporter to maintain broader export
capabilities. (ABM-268)