Bring in fixed git