Issue #17547: alternative fix as suggested by Eugene.