landed patch for bug 888407