Fixes #27113, a regression from 6daed7d122 (cherry picked from commit 699a3957ce)
6daed7d122
699a3957ce