diff --git a/src/client/pythonEnvironments/base/locators/common/resourceBasedLocator.ts b/src/client/pythonEnvironments/base/locators/common/resourceBasedLocator.ts
index 135490848fc2..4f4c07188b43 100644
--- a/src/client/pythonEnvironments/base/locators/common/resourceBasedLocator.ts
+++ b/src/client/pythonEnvironments/base/locators/common/resourceBasedLocator.ts
@@ -45,18 +45,18 @@ export abstract class LazyResourceBasedLocator extends Locator<BasicEnvInfo> imp
         await this.disposables.dispose();
     }
 
-    public async *iterEnvs(query?: PythonLocatorQuery): IPythonEnvsIterator<BasicEnvInfo> {
-        await this.activate();
+    public iterEnvs(query?: PythonLocatorQuery): IPythonEnvsIterator<BasicEnvInfo> {
         const iterator = this.doIterEnvs(query);
         const it = this._iterEnvs(iterator, query);
         it.onUpdated = iterator.onUpdated;
-        yield* it;
+        return it;
     }
 
     private async *_iterEnvs(
         iterator: IPythonEnvsIterator<BasicEnvInfo>,
         query?: PythonLocatorQuery,
     ): IPythonEnvsIterator<BasicEnvInfo> {
+        await this.activate();
         if (query?.envPath) {
             let result = await iterator.next();
             while (!result.done) {
diff --git a/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts b/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
index cf61b7644f72..69cfb03c1f76 100644
--- a/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
+++ b/src/client/pythonEnvironments/base/locators/composite/envsCollectionService.ts
@@ -146,7 +146,6 @@ export class EnvsCollectionService extends PythonEnvsWatcher<PythonEnvCollection
                     switch (event.stage) {
                         case ProgressReportStage.discoveryFinished:
                             state.done = true;
-                            listener.dispose();
                             break;
                         case ProgressReportStage.allPathsDiscovered:
                             if (!query) {
diff --git a/src/client/pythonEnvironments/base/locators/composite/envsReducer.ts b/src/client/pythonEnvironments/base/locators/composite/envsReducer.ts
index 61f6b085aa2d..183c416e8064 100644
--- a/src/client/pythonEnvironments/base/locators/composite/envsReducer.ts
+++ b/src/client/pythonEnvironments/base/locators/composite/envsReducer.ts
@@ -57,7 +57,7 @@ async function* iterEnvsIterator(
             if (isProgressEvent(event)) {
                 if (event.stage === ProgressReportStage.discoveryFinished) {
                     state.done = true;
-                    listener.dispose();
+                    // listener.dispose();
                 } else {
                     didUpdate.fire(event);
                 }
@@ -128,7 +128,7 @@ function checkIfFinishedAndNotify(
 ) {
     if (state.done && state.pending === 0) {
         didUpdate.fire({ stage: ProgressReportStage.discoveryFinished });
-        didUpdate.dispose();
+        // didUpdate.dispose();
         traceVerbose(`Finished with environment reducer`);
     }
 }
diff --git a/src/client/pythonEnvironments/base/locators/composite/envsResolver.ts b/src/client/pythonEnvironments/base/locators/composite/envsResolver.ts
index ba81a8a672dd..3c3acfe09604 100644
--- a/src/client/pythonEnvironments/base/locators/composite/envsResolver.ts
+++ b/src/client/pythonEnvironments/base/locators/composite/envsResolver.ts
@@ -88,7 +88,7 @@ export class PythonEnvsResolver implements IResolvingLocator {
                     if (event.stage === ProgressReportStage.discoveryFinished) {
                         didUpdate.fire({ stage: ProgressReportStage.allPathsDiscovered });
                         state.done = true;
-                        listener.dispose();
+                        // listener.dispose();
                     } else {
                         didUpdate.fire(event);
                     }
@@ -176,7 +176,7 @@ function checkIfFinishedAndNotify(
 ) {
     if (state.done && state.pending === 0) {
         didUpdate.fire({ stage: ProgressReportStage.discoveryFinished });
-        didUpdate.dispose();
+        // didUpdate.dispose();
         traceVerbose(`Finished with environment resolver`);
     }
 }
diff --git a/src/client/pythonEnvironments/base/locators/lowLevel/condaLocator.ts b/src/client/pythonEnvironments/base/locators/lowLevel/condaLocator.ts
index 2a560a7ca4ac..34f1e45e5529 100644
--- a/src/client/pythonEnvironments/base/locators/lowLevel/condaLocator.ts
+++ b/src/client/pythonEnvironments/base/locators/lowLevel/condaLocator.ts
@@ -23,7 +23,7 @@ export class CondaEnvironmentLocator extends FSWatchingLocator {
     }
 
     // eslint-disable-next-line class-methods-use-this
-    public async *doIterEnvs(
+    public doIterEnvs(
         _: unknown,
         useWorkerThreads = inExperiment(DiscoveryUsingWorkers.experiment),
     ): IPythonEnvsIterator<BasicEnvInfo> {
diff --git a/src/client/pythonEnvironments/common/windowsUtils.ts b/src/client/pythonEnvironments/common/windowsUtils.ts
index e9210371be05..818bb0b157ea 100644
--- a/src/client/pythonEnvironments/common/windowsUtils.ts
+++ b/src/client/pythonEnvironments/common/windowsUtils.ts
@@ -152,6 +152,7 @@ async function getRegistryInterpretersImpl(useWorkerThreads: boolean): Promise<I
                     await getInterpreterDataFromRegistry(arch, hive, key, useWorkerThreads),
                 );
             }
+            console.timeLog('Time taken for windows registry');
         }
     }
     registryInterpretersCache = uniqBy(registryData, (r: IRegistryInterpreterData) => r.interpreterPath);
diff --git a/src/client/pythonEnvironments/index.ts b/src/client/pythonEnvironments/index.ts
index 5a5fceffa693..5f6ee1ae0786 100644
--- a/src/client/pythonEnvironments/index.ts
+++ b/src/client/pythonEnvironments/index.ts
@@ -135,21 +135,22 @@ async function createLocator(
 
 function createNonWorkspaceLocators(ext: ExtensionState): ILocator<BasicEnvInfo>[] {
     const locators: (ILocator<BasicEnvInfo> & Partial<IDisposable>)[] = [];
-    locators.push(
+    locators
+        .push
         // OS-independent locators go here.
-        new PyenvLocator(),
-        new CondaEnvironmentLocator(),
-        new ActiveStateLocator(),
-        new GlobalVirtualEnvironmentLocator(),
-        new CustomVirtualEnvironmentLocator(),
-    );
+        // new PyenvLocator(),
+        // new CondaEnvironmentLocator(),
+        // new ActiveStateLocator(),
+        // new GlobalVirtualEnvironmentLocator(),
+        // new CustomVirtualEnvironmentLocator(),
+        ();
 
     if (getOSType() === OSType.Windows) {
         locators.push(
             // Windows specific locators go here.
             new WindowsRegistryLocator(),
-            new MicrosoftStoreLocator(),
-            new WindowsPathEnvVarLocator(),
+            // new MicrosoftStoreLocator(),
+            // new WindowsPathEnvVarLocator(),
         );
     } else {
         locators.push(
@@ -184,9 +185,9 @@ function watchRoots(args: WatchRootsArgs): IDisposable {
 function createWorkspaceLocator(ext: ExtensionState): WorkspaceLocators {
     const locators = new WorkspaceLocators(watchRoots, [
         (root: vscode.Uri) => [
-            new WorkspaceVirtualEnvironmentLocator(root.fsPath),
-            new PoetryLocator(root.fsPath),
-            new CustomWorkspaceLocator(root.fsPath),
+            // new WorkspaceVirtualEnvironmentLocator(root.fsPath),
+            // new PoetryLocator(root.fsPath),
+            // new CustomWorkspaceLocator(root.fsPath),
         ],
         // Add an ILocator factory func here for each kind of workspace-rooted locator.
     ]);