Apply patch from UF's private repo upstream.