patch went upstream, so bump git version and remove patch locally