Bug 7986 Follow Up: Fix ExportRemoveFields