Revert back to vi-mode fix