Fixes #3187 - remove exported terms to avoid eternal conflicts
Merge pull request #3188 from aaronschachter/no_more_uuid

No more exporting terms