Remove temp hack, fix included in evil proper