landed patch for bug 628458