diff --git a/src/services/outliningElementsCollector.ts b/src/services/outliningElementsCollector.ts
index 748085bd041..d4f70d52eda 100644
--- a/src/services/outliningElementsCollector.ts
+++ b/src/services/outliningElementsCollector.ts
@@ -2,9 +2,9 @@
 namespace ts.OutliningElementsCollector {
     const collapseText = "...";
     const maxDepth = 20;
-    const regionText = "#region";
-    const regionStart = new RegExp("^\\s*//\\s*#region(\\s+.*)?$");
-    const regionEnd = new RegExp("^\\s*//\\s*#endregion(\\s|$)");
+    const defaultLabel = "#region";
+    const regionStart = new RegExp("^//\\s*#region(\\s+.*)?$");
+    const regionEnd = new RegExp("^//\\s*#endregion(\\s|$)");
 
     export function collectElements(sourceFile: SourceFile, cancellationToken: CancellationToken): OutliningSpan[] {
         const elements: OutliningSpan[] = [];
@@ -42,7 +42,7 @@ namespace ts.OutliningElementsCollector {
 
         function addOutliningSpanRegions(regionSpan: RegionRange) {
             if (regionSpan) {
-                const textSpan = createTextSpanFromBounds(regionSpan.pos, regionSpan.end);
+                const textSpan = createTextSpanFromRange(regionSpan);
                 const span: OutliningSpan = {
                     textSpan,
                     hintSpan: textSpan,
@@ -108,8 +108,8 @@ namespace ts.OutliningElementsCollector {
         }
 
         function getRegionName(start: number, end: number) {
-            if (!ts.formatting.getRangeOfEnclosingComment(sourceFile, start, /*onlyMultiLine*/ true)) {
-                const comment = sourceFile.text.substring(start, end);
+            if (!isInComment(sourceFile, start)) {
+                const comment = sourceFile.text.substring(start, end).trim();
                 const result = comment.match(regionStart);
 
                 if (result && result.length > 0) {
@@ -118,7 +118,7 @@ namespace ts.OutliningElementsCollector {
                         return label.trim();
                     }
                     else {
-                        return regionText;
+                        return defaultLabel;
                     }
                 }
             }
@@ -126,11 +126,11 @@ namespace ts.OutliningElementsCollector {
         }
 
         function isRegionEnd(start: number, end: number) {
-            if (!ts.formatting.getRangeOfEnclosingComment(sourceFile, start, /*onlyMultiLine*/ true)) {
-                const comment = sourceFile.text.substring(start, end);
-                return comment.match(regionEnd);
+            if (!isInComment(sourceFile, start)) {
+                const comment = sourceFile.text.substring(start, end).trim();
+                return !!comment.match(regionEnd);
             }
-            return undefined;
+            return false;
         }
 
         function gatherRegions(): void {
diff --git a/tests/cases/fourslash/getOutliningSpansForRegions.ts b/tests/cases/fourslash/getOutliningSpansForRegions.ts
index 80e1c3113cf..151526c6b99 100644
--- a/tests/cases/fourslash/getOutliningSpansForRegions.ts
+++ b/tests/cases/fourslash/getOutliningSpansForRegions.ts
@@ -1,6 +1,6 @@
 /// <reference path="fourslash.ts"/>
 
-////// basic region
+////// region without label
 ////[|// #region
 ////
 ////// #endregion|]
@@ -29,7 +29,7 @@
 ////
 ////// #endregion outer|]
 ////
-////// region delimiters not valid when preceding text on line
+////// region delimiters not valid when there is preceding text on line
 //// test // #region invalid1
 ////
 ////test // #endregion