Revert "Another attempt at evaluation shortcut"

This reverts commit c581b7ea36274826b95497570231335dd6b77468.