Revert "merged branch egeloen/f-2.0-terminal-width (PR #6571)"

This reverts commit 515769385a00b0fb1ddeafb6a0db1c50e8f6b8d2, reversing
changes made to cd0a9d7a1d5f383b931fff21a82e29d53362065e.