Reverted evil modification (still evil though)