Revert "Grammar update for vi-vim"

This reverts commit 8ce21661864ce467d1c7faf63f88a209c382aaee.