Merge branch 'master' into select

1 files changed, 3 insertions, 3 deletions

diff --git a/main.c b/main.c
index 93f94998..f2bea917 100644
--- a/main.c
+++ b/main.c
@@ -794,10 +794,10 @@ init_vars()
 			(*(vp->assign))();
 	}
 
-	/* Set up deferred variables (loaded only when accessed). */
+	/* Load PROCINFO and ENVIRON */
 	if (! do_traditional)
-		register_deferred_variable("PROCINFO", load_procinfo);
-	register_deferred_variable("ENVIRON", load_environ);
+		load_procinfo();
+	load_environ();
 }
 
 /* path_environ --- put path variable into environment if not already there */