patch for bug 916997