diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts
index 785a214c7a3..d71ddf83ea1 100644
--- a/src/vs/code/electron-main/app.ts
+++ b/src/vs/code/electron-main/app.ts
@@ -697,8 +697,6 @@ export class CodeApplication extends Disposable {
 	private handleRemoteAuthorities(): void {
 		const connectionPool: Map<string, ActiveConnection> = new Map<string, ActiveConnection>();
 
-		const isBuilt = this.environmentService.isBuilt;
-
 		class ActiveConnection {
 			private readonly _authority: string;
 			private readonly _connection: Promise<ManagementPersistentConnection>;
@@ -708,7 +706,6 @@ export class CodeApplication extends Disposable {
 				this._authority = authority;
 
 				const options: IConnectionOptions = {
-					isBuilt,
 					commit: product.commit,
 					socketFactory: nodeSocketFactory,
 					addressProvider: {
diff --git a/src/vs/platform/remote/common/remoteAgentConnection.ts b/src/vs/platform/remote/common/remoteAgentConnection.ts
index ad95b6751a7..5653a6912b2 100644
--- a/src/vs/platform/remote/common/remoteAgentConnection.ts
+++ b/src/vs/platform/remote/common/remoteAgentConnection.ts
@@ -35,7 +35,6 @@ export interface ConnectionTypeRequest {
 	signedData?: string;
 	desiredConnectionType?: ConnectionType;
 	args?: any;
-	isBuilt: boolean;
 }
 
 export interface ErrorMessage {
@@ -51,7 +50,6 @@ export type HandshakeMessage = AuthRequest | SignRequest | ConnectionTypeRequest
 
 
 interface ISimpleConnectionOptions {
-	isBuilt: boolean;
 	commit: string | undefined;
 	host: string;
 	port: number;
@@ -110,8 +108,7 @@ async function connectToRemoteExtensionHostAgent(options: ISimpleConnectionOptio
 					type: 'connectionType',
 					commit: options.commit,
 					signedData: signed,
-					desiredConnectionType: connectionType,
-					isBuilt: options.isBuilt
+					desiredConnectionType: connectionType
 				};
 				if (args) {
 					connTypeRequest.args = args;
@@ -200,7 +197,6 @@ async function doConnectRemoteAgentTunnel(options: ISimpleConnectionOptions, sta
 }
 
 export interface IConnectionOptions {
-	isBuilt: boolean;
 	commit: string | undefined;
 	socketFactory: ISocketFactory;
 	addressProvider: IAddressProvider;
@@ -210,7 +206,6 @@ export interface IConnectionOptions {
 async function resolveConnectionOptions(options: IConnectionOptions, reconnectionToken: string, reconnectionProtocol: PersistentProtocol | null): Promise<ISimpleConnectionOptions> {
 	const { host, port } = await options.addressProvider.getAddress();
 	return {
-		isBuilt: options.isBuilt,
 		commit: options.commit,
 		host: host,
 		port: port,
diff --git a/src/vs/workbench/services/extensions/common/remoteExtensionHostClient.ts b/src/vs/workbench/services/extensions/common/remoteExtensionHostClient.ts
index 037a2534d92..47aaf4a22bb 100644
--- a/src/vs/workbench/services/extensions/common/remoteExtensionHostClient.ts
+++ b/src/vs/workbench/services/extensions/common/remoteExtensionHostClient.ts
@@ -71,7 +71,6 @@ export class RemoteExtensionHostClient extends Disposable implements IExtensionH
 
 	public start(): Promise<IMessagePassingProtocol> {
 		const options: IConnectionOptions = {
-			isBuilt: this._environmentService.isBuilt,
 			commit: this._productService.commit,
 			socketFactory: this._socketFactory,
 			addressProvider: {
diff --git a/src/vs/workbench/services/remote/browser/remoteAgentServiceImpl.ts b/src/vs/workbench/services/remote/browser/remoteAgentServiceImpl.ts
index 4219ca53901..fd979ca094c 100644
--- a/src/vs/workbench/services/remote/browser/remoteAgentServiceImpl.ts
+++ b/src/vs/workbench/services/remote/browser/remoteAgentServiceImpl.ts
@@ -28,7 +28,7 @@ export class RemoteAgentService extends AbstractRemoteAgentService implements IR
 		super(environmentService);
 
 		this.socketFactory = new BrowserSocketFactory(webSocketFactory);
-		this._connection = this._register(new RemoteAgentConnection(environmentService.configuration.remoteAuthority!, productService.commit, this.socketFactory, environmentService, remoteAuthorityResolverService, signService));
+		this._connection = this._register(new RemoteAgentConnection(environmentService.configuration.remoteAuthority!, productService.commit, this.socketFactory, remoteAuthorityResolverService, signService));
 	}
 
 	getConnection(): IRemoteAgentConnection | null {
diff --git a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
index e48834a6a6b..5168e7f16c3 100644
--- a/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
+++ b/src/vs/workbench/services/remote/common/abstractRemoteAgentService.ts
@@ -84,7 +84,6 @@ export class RemoteAgentConnection extends Disposable implements IRemoteAgentCon
 		remoteAuthority: string,
 		private readonly _commit: string | undefined,
 		private readonly _socketFactory: ISocketFactory,
-		private readonly _environmentService: IEnvironmentService,
 		private readonly _remoteAuthorityResolverService: IRemoteAuthorityResolverService,
 		private readonly _signService: ISignService
 	) {
@@ -111,7 +110,6 @@ export class RemoteAgentConnection extends Disposable implements IRemoteAgentCon
 	private async _createConnection(): Promise<Client<RemoteAgentConnectionContext>> {
 		let firstCall = true;
 		const options: IConnectionOptions = {
-			isBuilt: this._environmentService.isBuilt,
 			commit: this._commit,
 			socketFactory: this._socketFactory,
 			addressProvider: {
diff --git a/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts b/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts
index 538fb1be860..82d039a6c54 100644
--- a/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts
+++ b/src/vs/workbench/services/remote/electron-browser/remoteAgentServiceImpl.ts
@@ -27,7 +27,7 @@ export class RemoteAgentService extends AbstractRemoteAgentService implements IR
 		super(environmentService);
 		this.socketFactory = nodeSocketFactory;
 		if (remoteAuthority) {
-			this._connection = this._register(new RemoteAgentConnection(remoteAuthority, product.commit, nodeSocketFactory, environmentService, remoteAuthorityResolverService, signService));
+			this._connection = this._register(new RemoteAgentConnection(remoteAuthority, product.commit, nodeSocketFactory, remoteAuthorityResolverService, signService));
 		}
 	}
 
diff --git a/src/vs/workbench/services/remote/node/tunnelService.ts b/src/vs/workbench/services/remote/node/tunnelService.ts
index 9a359e44c28..87b657be6a5 100644
--- a/src/vs/workbench/services/remote/node/tunnelService.ts
+++ b/src/vs/workbench/services/remote/node/tunnelService.ts
@@ -100,7 +100,6 @@ export class TunnelService implements ITunnelService {
 		}
 
 		const options: IConnectionOptions = {
-			isBuilt: this.environmentService.isBuilt,
 			commit: product.commit,
 			socketFactory: nodeSocketFactory,
 			addressProvider: {