Using newer core changes to make GitStatus potentially work.