Revert "Merge pull request #686 from sheldonkwok/master"
Revert "Merge pull request #686 from sheldonkwok/master"

This reverts commit 42825e990cc345cb977877d074ec12eec690818a, reversing
changes made to 2d096f9726a88d73297609fc35f3459c916acacd.

naorunaoru/vim-mode-next,bronson/vim-mode-next