Patch #3, no longer applies. re-rolled the patch for 10.1.x