--- a/autoload/gutentags.vim	Sat Mar 11 21:50:00 2017 -0800
+++ b/autoload/gutentags.vim	Thu Mar 23 16:00:24 2017 -0700
@@ -2,14 +2,6 @@
 
 " Utilities {{{
 
-function! gutentags#pwd()
-  if has('nvim')
-    return haslocaldir() ? getcwd(0, 0) : haslocaldir(-1, 0) ? getcwd(-1, 0) : getcwd()
-  else
-    return haslocaldir() ? getcwd(0, 0) : getcwd()
-  endif
-endfunction
-
 function! gutentags#chdir(path)
   if has('nvim')
     let chdir = haslocaldir() ? 'lcd' : haslocaldir(-1, 0) ? 'tcd' : 'cd'
@@ -402,7 +394,7 @@
     " Switch to the project root to make the command line smaller, and make
     " it possible to get the relative path of the filename to parse if we're
     " doing an incremental update.
-    let l:prev_cwd = gutentags#pwd()
+    let l:prev_cwd = getcwd()
     call gutentags#chdir(fnameescape(l:proj_dir))
     try
         call call("gutentags#".a:module."#generate",