Submitted patch for bug 969009