Revert "Define environment variables in a list"

This reverts commit 24450a8e94fcb0ec4a5abc22b7d5cd94a3ff13c2.