Submitted patch for bug 984595