Submitted patch for bug 969387