Revert "Fix evaluation of environment variables."

This reverts commit 2514473977cce859d0542816694a8b8453377190.