This needs to be enabled for the non-git case as well now.