This reverts commit 8e13d34944. It turns out this breaks the build of emacsGit from the nix-community overlay.
8e13d34944