Preliminary patch for RC3 brokenness