Reverting the changeset 5d76a4746d9d made for Issue #12921