evolution almost done, need testing
Revert "evolution almost done, need testing"

This reverts commit 75229cab3f7618c7bc163247b24fe0b51699c9ac.