Add initial patch for Bug 801618.