From 38a2a61b38b804bdb59758bf256b53c533001dc7 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 16 Feb 2016 19:39:22 +0000
Subject: [PATCH] back out hacky previous commit as #946 only happens when
 gemini is disabled

---
 src/components/structures/ScrollPanel.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js
index fd8befea01..514937f877 100644
--- a/src/components/structures/ScrollPanel.js
+++ b/src/components/structures/ScrollPanel.js
@@ -418,9 +418,7 @@ module.exports = React.createClass({
         var scrollState = this.scrollState;
         var scrollNode = this._getScrollNode();
 
-        // XXX: DISABLE SCROLL TO TOKEN ENTIRELY TEMPORARILY AS IT'S SCREWING
-        // UP MY DEMO - see https://github.com/vector-im/vector-web/issues/946
-        if (true || scrollState.stuckAtBottom) {
+        if (scrollState.stuckAtBottom) {
             scrollNode.scrollTop = scrollNode.scrollHeight;
             debuglog("Scrolled to bottom; offset now", scrollNode.scrollTop);
         } else if (scrollState.trackedScrollToken) {