Revert MFC of r323865

While this behavior can be viewed as a bug fix, due to the fundamental
nature of cat(1), leave this change only for a major version.

PR: 210607
Requested by: sevan