Hack to work with latest Neovim

Bring up to date with https://github.com/neovim/neovim/tree/48847fbafc41d93bbc42d7bf5711a47c4982e08c