cf #356, which fixed #354 but only for Git.
cf #356, which fixed #354 but only for Git.