diff --git a/src/applications/macro/application/PhabricatorMacroApplication.php b/src/applications/macro/application/PhabricatorMacroApplication.php
index fc7dcabab6..3519a3f520 100644
--- a/src/applications/macro/application/PhabricatorMacroApplication.php
+++ b/src/applications/macro/application/PhabricatorMacroApplication.php
@@ -42,13 +42,6 @@ final class PhabricatorMacroApplication extends PhabricatorApplication {
     );
   }
 
-  public function getRemarkupRules() {
-    return array(
-      new PhabricatorIconRemarkupRule(),
-      new PhabricatorEmojiRemarkupRule(),
-    );
-  }
-
   protected function getCustomCapabilities() {
     return array(
       PhabricatorMacroManageCapability::CAPABILITY => array(
diff --git a/src/infrastructure/markup/PhabricatorMarkupEngine.php b/src/infrastructure/markup/PhabricatorMarkupEngine.php
index ed51b00175..c3d9dab02a 100644
--- a/src/infrastructure/markup/PhabricatorMarkupEngine.php
+++ b/src/infrastructure/markup/PhabricatorMarkupEngine.php
@@ -492,6 +492,9 @@ final class PhabricatorMarkupEngine extends Phobject {
       $rules[] = new PhabricatorYoutubeRemarkupRule();
     }
 
+    $rules[] = new PhabricatorIconRemarkupRule();
+    $rules[] = new PhabricatorEmojiRemarkupRule();
+
     $applications = PhabricatorApplication::getAllInstalledApplications();
     foreach ($applications as $application) {
       foreach ($application->getRemarkupRules() as $rule) {