Apply patch from UF's private 0.11.1-hcv branch.