evil upstream already does this
go back to evil on by default