Updated to 6.4.3. This eliminates some patches to build it.