landed patch for bug 863943 in inbound