Has this gone upstream? If not we should probably just symlink the `.git` directory so it doesn't need patched.