as documented in #23221.

To be checked: Is this the same algorithm as before? If not tests would fail and we should not replace the existing calls.