Unfortunate side effects of git class requires a workaround