Issue #15298: refactor previous fix from 66959d419369.
1 file changed