a8eeb0715c
Fixes #10151 (I think?) (cherry picked from commit 5854ad97e0dbada0b75feda268bf4d57a7161d01)
Fixes #10151 (I think?) (cherry picked from commit 5854ad97e0dbada0b75feda268bf4d57a7161d01)