Issue #6500: Reverting fbea8ff8db5e since it broke tests
3 files changed