Submitted patch for bug 964738