Revert: [BIServer 6509] rewrite import/export to use latest pen: spring (6acf570)