Partially address #2689.
The install-git target still needs to be done right as discussed
in #2689.