1 files changed, 1 insertions, 16 deletions

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index a0f68df98..931418d02 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -75,7 +75,7 @@ module.exports = React.createClass({
             this.setState({selectedMention: 0, selectedUsername: ''});
         }
     },
-    onListenerChange: function(id, mentionText, excludeList) {
+    onListenerChange: function(id, mentionText) {
         if (id !== this.props.id) {
             return;
         }
@@ -84,9 +84,6 @@ module.exports = React.createClass({
         if (mentionText != null) {
             newState.mentionText = mentionText;
         }
-        if (excludeList != null) {
-            newState.excludeUsers = excludeList;
-        }
 
         this.setState(newState);
     },
@@ -143,15 +140,6 @@ module.exports = React.createClass({
             scrollTop: scrollAmount
         }, 75);
     },
-    alreadyMentioned: function(username) {
-        var excludeUsers = this.state.excludeUsers;
-        for (var i = 0; i < excludeUsers.length; i++) {
-            if (excludeUsers[i] === username) {
-                return true;
-            }
-        }
-        return false;
-    },
     getInitialState: function() {
         return {excludeUsers: [], mentionText: '-1', selectedMention: 0, selectedUsername: ''};
     },
@@ -195,9 +183,6 @@ module.exports = React.createClass({
         var index = 0;
 
         for (var i = 0; i < users.length && index < MAX_ITEMS_IN_LIST; i++) {
-            if (this.alreadyMentioned(users[i].username)) {
-                continue;
-            }
             if ((users[i].first_name && users[i].first_name.lastIndexOf(mentionText, 0) === 0) ||
                     (users[i].last_name && users[i].last_name.lastIndexOf(mentionText, 0) === 0) ||
                     users[i].username.lastIndexOf(mentionText, 0) === 0) {