Last git-related one for real. Also restores to original state