diff --git a/datacube/api/core.py b/datacube/api/core.py
index 4df145fbc..2e23b6681 100644
--- a/datacube/api/core.py
+++ b/datacube/api/core.py
@@ -120,9 +120,9 @@ def __init__(self,
             return
 
         # Obtain an ODCEnvironment object:
-        self.cfg_env = ODCConfig.get_environment(env=env, config=config, raw_config=raw_config)
+        cfg_env = ODCConfig.get_environment(env=env, config=config, raw_config=raw_config)
 
-        self.index = index_connect(self.cfg_env,
+        self.index = index_connect(cfg_env,
                                    application_name=app,
                                    validate_connection=validate_connection)
 
@@ -550,7 +550,7 @@ def filter_jan(dataset): return dataset.time.begin.month == 1
 
         if skip_broken_datasets is None:
             # default to value from env var, which defaults to False
-            skip_broken_datasets = self.cfg_env["skip_broken_datasets"]
+            skip_broken_datasets = self.index.environment["skip_broken_datasets"]
 
         result = self.load_data(grouped, geobox,
                                 measurement_dicts,