use evil-escape again

This reverts commit d4c18a74d603d0edb36a51b92bfae764b6080050.