revert the fix of EVIL