Re-enabled 'dst' part of export

Its still horribly slow, but does the job for now