Reverting the changeset 5126e62c60af made for Issue #12921
2 files changed