Landed patch for bug 1043924