New patches for bug 687807.