Submitted patch for bug 984921