issue #21894: Fix problem causing tests to fail.