Definitive fix with Git.