diff --git a/templates/zerver/team.html b/templates/zerver/team.html
index a48b6e0ce3..cfc89c577d 100644
--- a/templates/zerver/team.html
+++ b/templates/zerver/team.html
@@ -117,24 +117,18 @@
                     team have made major contributions to the project.
                 </p>
 
-                {% for row in data %}
-                    {% for group in (row[0:3], row[3:6]) %}
-                        {% for person in group %}
-                            {% if person %}
-                            <div class="person">
-                                <a href="https://github.com/{{ person.name }}" target="_blank" class="no-underline">
-                                    <div class="avatar">
-                                        <img class="avatar_img" src="{{ person.avatar }}" alt="{{ _('Avatar') }}" />
-                                    </div>
-                                    <div class='info'>
-                                        <b>@{{ person.name }}</b><br />
-                                        {{ person.commits }} commits
-                                    </div>
-                                </a>
-                            </div>
-                            {% endif %}
-                        {% endfor %}
-                    {% endfor %}
+                {% for person in data %}
+                <div class="person">
+                    <a href="https://github.com/{{ person.name }}" target="_blank" class="no-underline">
+                        <div class="avatar">
+                            <img class="avatar_img" src="{{ person.avatar }}" alt="{{ _('Avatar') }}" />
+                        </div>
+                        <div class='info'>
+                            <b>@{{ person.name }}</b><br />
+                            {{ person.commits }} commits
+                        </div>
+                    </a>
+                </div>
                 {% endfor %}
 
                 <p class="last-updated">
diff --git a/tools/update-authors-json b/tools/update-authors-json
index 37358ec7fc..54c2bbecff 100755
--- a/tools/update-authors-json
+++ b/tools/update-authors-json
@@ -83,10 +83,11 @@ def run_production():
             )
             contribs.append(result_user)
 
-        out_contrib_data = split_by(
-            sorted(contribs, key=lambda k: k.get('commits'), reverse=True),
-            6, None
-        )  # type: List[List[Optional[Dict[str, Union[Text, int]]]]]
+        out_contrib_data = sorted(
+            contribs,
+            key=lambda k: k.get('commits'),
+            reverse=True
+        )  # type: List[Dict[str, Union[Text, int]]]
 
         out_data = dict(
             data=out_contrib_data,
diff --git a/zerver/fixtures/authors.json b/zerver/fixtures/authors.json
index fdfcaf2776..fc9108ed33 100644
--- a/zerver/fixtures/authors.json
+++ b/zerver/fixtures/authors.json
@@ -1,39 +1,44 @@
 {
-    "date": "2050-11-5",
-    "data": [
-        [{
-            "commits": 4131,
-            "name": "timabbott",
-            "avatar": "https://avatars.githubusercontent.com/u/2746074?v=3"
-        }, {
-            "commits": 1102,
-            "name": "zbenjamin",
-            "avatar": "https://avatars.githubusercontent.com/u/58684?v=3"
-        }, {
-            "commits": 704,
-            "name": "wdaher",
-            "avatar": "https://avatars.githubusercontent.com/u/109246?v=3"
-        }, {
-            "commits": 671,
-            "name": "lfranchi",
-            "avatar": "https://avatars.githubusercontent.com/u/67976?v=3"
-        }],
-        [{
-            "commits": 524,
-            "name": "showell",
-            "avatar": "https://avatars.githubusercontent.com/u/142908?v=3"
-        }, {
-            "commits": 425,
-            "name": "lfaraone",
-            "avatar": "https://avatars.githubusercontent.com/u/73410?v=3"
-        }, {
-            "commits": 385,
-            "name": "sharmaeklavya2",
-            "avatar": "https://avatars.githubusercontent.com/u/3839472?v=3"
-        }, {
-            "commits": 295,
-            "name": "umairwaheed",
-            "avatar": "https://avatars.githubusercontent.com/u/641763?v=3"
-        }]
-    ]
+    "data": [{
+        "commits": 6031,
+        "name": "timabbott",
+        "avatar": "https://avatars0.githubusercontent.com/u/2746074?v=4"
+    }, {
+        "commits": 1615,
+        "name": "showell",
+        "avatar": "https://avatars2.githubusercontent.com/u/142908?v=4"
+    }, {
+        "commits": 1103,
+        "name": "zbenjamin",
+        "avatar": "https://avatars3.githubusercontent.com/u/58684?v=4"
+    }, {
+        "commits": 704,
+        "name": "wdaher",
+        "avatar": "https://avatars1.githubusercontent.com/u/109246?v=4"
+    }, {
+        "commits": 671,
+        "name": "lfranchi",
+        "avatar": "https://avatars2.githubusercontent.com/u/67976?v=4"
+    }, {
+        "commits": 644,
+        "name": "umairwaheed",
+        "avatar": "https://avatars1.githubusercontent.com/u/641763?v=4"
+    }, {
+        "commits": 633,
+        "name": "rishig",
+        "avatar": "https://avatars2.githubusercontent.com/u/890911?v=4"
+    }, {
+        "commits": 607,
+        "name": "brockwhittaker",
+        "avatar": "https://avatars0.githubusercontent.com/u/10321399?v=4"
+    }, {
+        "commits": 508,
+        "name": "hackerkid",
+        "avatar": "https://avatars1.githubusercontent.com/u/7190633?v=4"
+    }, {
+        "commits": 490,
+        "name": "adnrs96",
+        "avatar": "https://avatars3.githubusercontent.com/u/17237412?v=4"
+    }],
+    "date": "2017-11-10"
 }