Revert wrong change in previous commit (issue #19085).