I'm not sure this change is correct. We still want users defining variables inside of `spark-env.sh` right?