Revert "some changes to eval"

This reverts commit f96973d1d66851145947c07c05d2788e227d9ee1.