Revert to manual quoting to make sure env variables can be used as part of other env variables when prefixing

Revert to manual quoting to make sure env variables can be used as part of other env variables when prefixing #527