Revert "Rolling out Vim, Phase 1"

This reverts commit 7ae7895e3890344ce6666023c20f1432f91d13df.