Submitted patch for bug 977893