This is the only way to solve issue #101963, for now. (cherry picked from commit 030a521adc9510207dd9f06b8d8b552ff7d999f9)