Move back to the way it ways because we can now use ENV.