Issue #12713: reverted fix pending further discussion.
4 files changed