revert incomplete fix for ticket #600: not enough for more complex scoping and evaluation time issues