diff --git a/src/infrastructure/markup/markuprule/PhutilRemarkupDocumentLinkRule.php b/src/infrastructure/markup/markuprule/PhutilRemarkupDocumentLinkRule.php
--- a/src/infrastructure/markup/markuprule/PhutilRemarkupDocumentLinkRule.php
+++ b/src/infrastructure/markup/markuprule/PhutilRemarkupDocumentLinkRule.php
@@ -79,14 +79,12 @@
     $same_window = $engine->getConfig('uri.same-window', null);
 
     if ($same_window === null) {
-      // TODO:
       // Instead of assuming every link as external,
       // assume that only external links should be opened
       // externally. This still probably creates lot of
       // external links than needed, but less than before.
       // https://we.phorge.it/T15161
-//    $same_window = $this->isInternalGenericURI($link);
-      $same_window = false;
+      $same_window = $this->isInternalGenericURI($link);
     }
 
     if ($same_window) {
diff --git a/src/infrastructure/markup/markuprule/PhutilRemarkupHyperlinkRule.php b/src/infrastructure/markup/markuprule/PhutilRemarkupHyperlinkRule.php
--- a/src/infrastructure/markup/markuprule/PhutilRemarkupHyperlinkRule.php
+++ b/src/infrastructure/markup/markuprule/PhutilRemarkupHyperlinkRule.php
@@ -119,14 +119,12 @@
     $same_window = $engine->getConfig('uri.same-window', null);
 
     if ($same_window === null) {
-      // TODO:
       // Instead of assuming every link as external,
       // assume that only external links should be opened
       // externally. This still probably creates lot of
       // external links than needed, but less than before.
       // https://we.phorge.it/T15161
-//    $same_window = $this->isInternalAbsoluteURI($link);
-      $same_window = false;
+      $same_window = $this->isInternalAbsoluteURI($link);
     }
 
     if ($same_window) {