Patch for r285.
Oh, breh, I didn't even notice the "no bug reports in this this area" note because everyone else Is sending bug reports.