Reverts #280 Fix evil-surround vim-surround inconsistency