Fix with newer git code.