Revert parts of patch #453627, documenting the resulting test failures
instead.
6 files changed