Align legacy site builder generator with latest fix to be able to override default environment variables.