Update patch for bug 687807.