Port geoffs vim fix to neovim