Since some of the vars contained in there may be used in the templating
of other variables. This also reverts e83a494e which originally fixed
issue #6979 but broke some other variable related things.

Fixes #6979
Fixes #7321
Fixes #7332