Something went wrong there, while applying a diff patch from the v1.6.2 commits