Try re-rolling patch from git.