Undoing some git screwups