port from clean 2.6 txt export
revert version