Improved patch for #108664.