This fixes #699. **Warning:** this change breaks with backward compatibility, e.g. for log parsing tool chains.