Submitted patch for bug 995466