A better long-term fix is being discussed in #4. BUG: 449560 FIXED-IN: 5.24.1 (cherry picked from commit ace23390)