Update patch from r198 with git.