landed patch for bug 863943