Don't use env vars for configuration time options (part 2)

Retry  #1587