diff --git a/app/assets/javascripts/discourse/widgets/embedded-post.js.es6 b/app/assets/javascripts/discourse/widgets/embedded-post.js.es6
index d36ef748bd1..8c1ed5477f5 100644
--- a/app/assets/javascripts/discourse/widgets/embedded-post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/embedded-post.js.es6
@@ -1,4 +1,5 @@
-import RawHtml from 'discourse/widgets/raw-html';
+import PostCooked from 'discourse/widgets/post-cooked';
+import DecoratorHelper from 'discourse/widgets/decorator-helper';
 import { createWidget } from 'discourse/widgets/widget';
 import { h } from 'virtual-dom';
 import { iconNode } from 'discourse/helpers/fa-icon';
@@ -35,7 +36,7 @@ export default createWidget('embedded-post', {
               this.attach('poster-name', attrs),
               this.attach('post-link-arrow', { above: state.above, shareUrl: attrs.shareUrl })
             ]),
-            new RawHtml({html: `<div class='cooked'>${attrs.cooked}</div>`})
+            new PostCooked(attrs, new DecoratorHelper(this))
           ])
         ])
       ])
diff --git a/app/assets/javascripts/discourse/widgets/event-handler.js.es6 b/app/assets/javascripts/discourse/widgets/event-handler.js.es6
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index ffa1b1df67f..07a29b3b5ad 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -1,4 +1,5 @@
 import PostCooked from 'discourse/widgets/post-cooked';
+import DecoratorHelper from 'discourse/widgets/decorator-helper';
 import { createWidget, applyDecorators } from 'discourse/widgets/widget';
 import { iconNode } from 'discourse/helpers/fa-icon';
 import { transformBasicPost } from 'discourse/lib/transform-post';
@@ -225,17 +226,6 @@ createWidget('expand-post-button', {
   }
 });
 
-class DecoratorHelper {
-  constructor(widget) {
-    this.container = widget.container;
-    this._widget = widget;
-  }
-
-  getModel() {
-    return this._widget.findAncestorModel();
-  }
-}
-
 createWidget('post-contents', {
   buildKey: attrs => `post-contents-${attrs.id}`,