Revert "Merge pull request #2348 from matrix-org/bwindels/roomgridview-experimental"

This reverts commit ece5cb1fcc, reversing
changes made to 64a3d2521c.

src/components/views/rooms/RoomHeader.js

@@ -24,7 +24,6 @@ import { _t } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
 import Modal from "../../../Modal";
 import RateLimitedFunc from '../../../ratelimitedfunc';
-import dis from '../../../dispatcher';
 
 import * as linkify from 'linkifyjs';
 import linkifyElement from 'linkifyjs/element';
@@ -153,14 +152,6 @@ module.exports = React.createClass({
         });
     },
 
-    onToggleRightPanelClick: function(ev) {
-        if (this.props.collapsedRhs) {
-            dis.dispatch({action: "show_right_panel"});
-        } else {
-            dis.dispatch({action: "hide_right_panel"});
-        }
-    },
-
     _hasUnreadPins: function() {
         const currentPinEvent = this.props.room.currentState.getStateEvents("m.room.pinned_events", '');
         if (!currentPinEvent) return false;
@@ -418,17 +409,6 @@ module.exports = React.createClass({
                 </div>;
         }
 
-        let toggleRightPanelButton;
-        if (this.props.isGrid) {
-            toggleRightPanelButton =
-                <AccessibleButton
-                    className="mx_RoomHeader_button"
-                    onClick={this.onToggleRightPanelClick}
-                    title={_t('Toggle right panel')}>
-                    <TintableSvg src="img/feather-icons/toggle-right-panel.svg" width="20" height="20" />
-                </AccessibleButton>;
-        }
-
         return (
             <div className={"mx_RoomHeader light-panel " + (this.props.editing ? "mx_RoomHeader_editing" : "")}>
                 <div className="mx_RoomHeader_wrapper">
@@ -439,8 +419,7 @@ module.exports = React.createClass({
                     { saveButton }
                     { cancelButton }
                     { rightRow }
-                    { !this.props.isGrid ? <RoomHeaderButtons collapsedRhs={this.props.collapsedRhs} /> : undefined }
-                    { toggleRightPanelButton }
+                    <RoomHeaderButtons collapsedRhs={this.props.collapsedRhs} />
                 </div>
             </div>
         );