diff --git a/src/vs/vscode.proposed.d.ts b/src/vs/vscode.proposed.d.ts
index 3b21464790d5e2b6d0282e6fb49623ee144dce09..80d9ce244079af9483ecb9157400b676a2944672 100644
--- a/src/vs/vscode.proposed.d.ts
+++ b/src/vs/vscode.proposed.d.ts
@@ -308,13 +308,9 @@ declare module 'vscode' {
 		 */
 		readonly type: 'source';
 		/**
-		 * The source to which this breakpoint is attached.
+		 * The source and line position of this breakpoint.
 		 */
-		readonly source: Uri;
-		/**
-		 * The line and character position of the breakpoint.
-		 */
-		readonly location: Position;
+		readonly location: Location;
 	}
 
 	export interface FunctionBreakpoint extends Breakpoint {
diff --git a/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts b/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
index 69e00e88b6795683daf99618729e0c080cebbbe1..28026490146868630b30212207d06f7db626d3ec 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDebugService.ts
@@ -110,7 +110,7 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape {
 					enabled: bp.enabled,
 					condition: sbp.condition,
 					hitCondition: bp.hitCondition,
-					sourceUriStr: sbp.uri.toString(),
+					uri: sbp.uri,
 					line: sbp.lineNumber > 0 ? sbp.lineNumber - 1 : 0,
 					character: (typeof sbp.column === 'number' && sbp.column > 0) ? sbp.column - 1 : 0
 				};
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 8a108fdd5d59d31c0d35cd7eb4035aed929da6e6..cb65d9c5c87f5327b1683a99b57bdda888505956 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -635,7 +635,7 @@ export interface IBreakpointData {
 
 export interface ISourceBreakpointData extends IBreakpointData {
 	type: 'source';
-	sourceUriStr: string;
+	uri: URI;
 	line: number;
 	character: number;
 }
diff --git a/src/vs/workbench/api/node/extHostDebugService.ts b/src/vs/workbench/api/node/extHostDebugService.ts
index 426679641c469fd99b9741c7e4e6091629429e27..eb16b40ab73fa7ed984a5d6f5f85f6739261a0e3 100644
--- a/src/vs/workbench/api/node/extHostDebugService.ts
+++ b/src/vs/workbench/api/node/extHostDebugService.ts
@@ -12,7 +12,7 @@ import { ExtHostWorkspace } from 'vs/workbench/api/node/extHostWorkspace';
 
 import * as vscode from 'vscode';
 import URI from 'vs/base/common/uri';
-import { Disposable, Position } from 'vs/workbench/api/node/extHostTypes';
+import { Disposable, Position, Location } from 'vs/workbench/api/node/extHostTypes';
 
 
 export class ExtHostDebugService implements ExtHostDebugServiceShape {
@@ -148,8 +148,7 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
 			enabled: bp.enabled,
 			condition: bp.condition,
 			hitCondition: bp.hitCondition,
-			source: URI.parse(bp.sourceUriStr),
-			location: new Position(bp.line, bp.character)
+			location: new Location(bp.uri, new Position(bp.line, bp.character))
 		};
 		return sbp;
 	}