Comment by ramranch

Would re-exporting partially solve your problem?