Merge pull request #781 from totten/decouple-fix-exporter