diff --git a/src/parser/ArcanistCommentRemover.php b/src/parser/ArcanistCommentRemover.php
index dad113c3..17f19c69 100644
--- a/src/parser/ArcanistCommentRemover.php
+++ b/src/parser/ArcanistCommentRemover.php
@@ -1,28 +1,32 @@
 <?php
 
 final class ArcanistCommentRemover extends Phobject {
 
   /**
    * Remove comment lines from a commit message. Strips trailing lines only,
    * and requires "#" to appear at the beginning of a line for it to be
    * considered a comment.
    */
   public static function removeComments($body) {
-    $lines = explode("\n", $body);
+    $body = rtrim($body);
+
+    $lines = phutil_split_lines($body);
     $lines = array_reverse($lines);
+
     foreach ($lines as $key => $line) {
-      if (!strlen($line)) {
-        unset($lines[$key]);
-        continue;
-      }
-      if ($line[0] == '#') {
+      if (preg_match('/^#/', $line)) {
         unset($lines[$key]);
         continue;
       }
+
       break;
     }
+
     $lines = array_reverse($lines);
-    return implode("\n", $lines)."\n";
+    $lines = implode('', $lines);
+    $lines = rtrim($lines)."\n";
+
+    return $lines;
   }
 
 }
diff --git a/src/parser/__tests__/ArcanistCommentRemoverTestCase.php b/src/parser/__tests__/ArcanistCommentRemoverTestCase.php
index d89a3d08..7de70934 100644
--- a/src/parser/__tests__/ArcanistCommentRemoverTestCase.php
+++ b/src/parser/__tests__/ArcanistCommentRemoverTestCase.php
@@ -1,32 +1,47 @@
 <?php
 
 final class ArcanistCommentRemoverTestCase extends PhutilTestCase {
 
   public function testRemover() {
     $test = <<<EOTEXT
 Here is a list:
 
   # Stuff
   # More Stuff
 
 The end.
 
 # Instructional comments.
 # Appear here.
 # At the bottom.
 EOTEXT;
 
     $expect = <<<EOTEXT
 Here is a list:
 
   # Stuff
   # More Stuff
 
 The end.
 
+EOTEXT;
+
+    $this->assertEqual($expect, ArcanistCommentRemover::removeComments($test));
+
+    $test = <<<EOTEXT
+Subscribers:
+#projectname
+
+# Instructional comments.
+EOTEXT;
+
+    $expect = <<<EOTEXT
+Subscribers:
+#projectname
+
 EOTEXT;
 
     $this->assertEqual($expect, ArcanistCommentRemover::removeComments($test));
   }
 
 }