Revert "#221 evil upgraded"

This reverts commit af2f76c213afa39b56a900441a52f7c4db7fec89.