landed patch for bug 886199