Revert "fix possible issue with export"

This reverts commit 52c9919b9aeb4f438ae873cf978d573687afff07.