Issue #17547: back to first fix approach.