Revert regression from r81256 (with release manager approval, see #8688)
3 files changed