Adapt for today's git state.
Remove patch that was integrated in upstream.