recovering from EGit's mess