gh-90005: Cleanup after GH-31698 (#91642)

2 files changed