Revert "Return evita and ville to cm-10.2"

This reverts commit 8d65bdf8d0edb948601861a8821c17d20f74ab80.