diff --git a/autoload/gitgutter.vim b/autoload/gitgutter.vim
index c7d5f3a..d095cd7 100644
--- a/autoload/gitgutter.vim
+++ b/autoload/gitgutter.vim
@@ -45,8 +45,6 @@ function! gitgutter#process_buffer(bufnr, force) abort
       endif
 
     endif
-  else
-    call s:clear(a:bufnr)
   endif
 endfunction
 
diff --git a/autoload/gitgutter/utility.vim b/autoload/gitgutter/utility.vim
index 1f283a3..bacbf22 100644
--- a/autoload/gitgutter/utility.vim
+++ b/autoload/gitgutter/utility.vim
@@ -50,8 +50,7 @@ function! gitgutter#utility#is_active(bufnr) abort
         \ !pumvisible() &&
         \ s:is_file_buffer(a:bufnr) &&
         \ s:exists_file(a:bufnr) &&
-        \ s:not_git_dir(a:bufnr) &&
-        \ !s:vimdiff(a:bufnr)
+        \ s:not_git_dir(a:bufnr)
 endfunction
 
 function! s:not_git_dir(bufnr) abort
@@ -206,28 +205,6 @@ function! s:strip_trailing_new_line(line) abort
   return substitute(a:line, '\n$', '', '')
 endfunction
 
-" Returns 1 if any of the given buffer's windows has the `&diff` option set,
-" or 0 otherwise.
-if exists('*win_findbuf')
-  function! s:vimdiff(bufnr) abort
-    for winid in win_findbuf(a:bufnr)
-      if getwinvar(winid, '&diff')
-        return 1
-      endif
-    endfor
-    return 0
-  endfunction
-else
-  function! s:vimdiff(bufnr) abort
-    for winnr in range(1, winnr('$'))
-      if winbufnr(winnr) == a:bufnr && getwinvar(winnr, '&diff')
-        return 1
-      endif
-    endfor
-    return 0
-  endfunction
-endif
-
 function! s:windows()
   return has('win64') || has('win32') || has('win16')
 endfunction