Revert "Merged evolution_api"

This reverts commit e416828f478a2df551117fcee89848aa9dcea421.