Revert "Since it seems to be valuable, try going other direction"

This reverts commit 4e02bf70c954c31997ac5ea34a2261f496b0a4a7.
Try removing eval condition