diff --git a/client/coral-embed-stream/src/tabs/stream/components/Comment.js b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
index 68cba9bc9..34334567f 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 
 import TagLabel from './TagLabel';
 import CommentTimestamp from 'coral-framework/components/CommentTimestamp';
-import { ReplyButton } from 'talk-plugin-replies';
+import ReplyButton from './ReplyButton';
 import ReplyBox from './ReplyBox';
 import { FlagComment } from 'talk-plugin-flags';
 import { can } from 'coral-framework/services/perms';
@@ -80,6 +80,11 @@ const ActionButton = ({ children }) => {
   );
 };
 
+ActionButton.propTypes = {
+  // id of currently opened ReplyBox. tracked in Stream.js
+  children: PropTypes.node,
+};
+
 // Determine whether the comment with id is in the part of the comments tree.
 function containsCommentId(props, id) {
   if (props.comment.id === id) {
@@ -155,6 +160,7 @@ export default class Comment extends React.Component {
 
   static propTypes = {
     // id of currently opened ReplyBox. tracked in Stream.js
+    children: PropTypes.node,
     activeReplyBox: PropTypes.string.isRequired,
     disableReply: PropTypes.bool,
     setActiveReplyBox: PropTypes.func.isRequired,
@@ -173,6 +179,12 @@ export default class Comment extends React.Component {
     }),
     charCountEnable: PropTypes.bool.isRequired,
     maxCharCount: PropTypes.number,
+    data: PropTypes.object,
+    root: PropTypes.object,
+    loadMore: PropTypes.func,
+    postDontAgree: PropTypes.func,
+    animateEnter: PropTypes.bool,
+    commentClassNames: PropTypes.array,
     comment: PropTypes.shape({
       depth: PropTypes.number,
       action_summaries: PropTypes.array.isRequired,
diff --git a/client/talk-plugin-replies/ReplyButton.css b/client/coral-embed-stream/src/tabs/stream/components/ReplyButton.css
similarity index 100%
rename from client/talk-plugin-replies/ReplyButton.css
rename to client/coral-embed-stream/src/tabs/stream/components/ReplyButton.css
diff --git a/client/talk-plugin-replies/ReplyButton.js b/client/coral-embed-stream/src/tabs/stream/components/ReplyButton.js
similarity index 96%
rename from client/talk-plugin-replies/ReplyButton.js
rename to client/coral-embed-stream/src/tabs/stream/components/ReplyButton.js
index 66433bdba..a19799a7c 100644
--- a/client/talk-plugin-replies/ReplyButton.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/ReplyButton.js
@@ -6,6 +6,7 @@ import t from 'coral-framework/services/i18n';
 import cn from 'classnames';
 import styles from './ReplyButton.css';
 
+// @TODO: remove this.
 const name = 'talk-plugin-replies';
 
 const ReplyButton = ({ onClick }) => {
diff --git a/client/talk-plugin-replies/index.js b/client/talk-plugin-replies/index.js
deleted file mode 100644
index f099e742b..000000000
--- a/client/talk-plugin-replies/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as ReplyButton } from './ReplyButton';
diff --git a/plugins/talk-plugin-auth/client/components/FakeComment.js b/plugins/talk-plugin-auth/client/components/FakeComment.js
index d7367e838..82c61182b 100644
--- a/plugins/talk-plugin-auth/client/components/FakeComment.js
+++ b/plugins/talk-plugin-auth/client/components/FakeComment.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import t from 'coral-framework/services/i18n';
-import { ReplyButton } from 'talk-plugin-replies';
+import ReplyButton from 'coral-embed-stream/src/tabs/stream/components/ReplyButton';
 import styles from './FakeComment.css';
 import { Icon } from 'plugin-api/beta/client/components/ui';
 import { CommentTimestamp } from 'plugin-api/beta/client/components';