Revert #3a81f60 for now

(with it some tests break and it can generate invalid output, see issue #44)