Hack to add back environment variables