Revert r83267, as it breaks a few doctests and generally leads to ugly truncated output.
2 files changed