name-value-eval-preparse.cpp: reverted last change (causes 54 aero-test regression tests to fail)