Revert "Updates to Export and Import"

This reverts commit 4dc9ad40a58b03f63cf525eda0a04372102fc8a2.