Revert "GH #1758: Don't clobber self while setting up block for evals."

This reverts commit d29b5ba01418cfa0a92aab34c958de5115907737.