issue #22155: Fixes so tests will pass again.