Try to fix the mess with git+filetree