Hotfix for AI-640: Added ad hoc optimization for common export case