Abstract out fix logic, and drop need for Git bundle fix, as upstream have fixed it