reverted patch to not evaluate symbols too eagerly