patch for bug 861338