Revert "Introduce EvalBundle, an interface on evaluation"

This reverts commit 7841be7eb2bc0a75452d07e9656632b7b1c96366,
which broke acceptance tests.