diff --git a/escher/include/escher/table_view.h b/escher/include/escher/table_view.h
index e67da825c..e090adc60 100644
--- a/escher/include/escher/table_view.h
+++ b/escher/include/escher/table_view.h
@@ -15,7 +15,6 @@ public:
 class TableView : public ScrollView {
 public:
   TableView(TableViewDataSource * dataSource);
-  void layoutSubviews() override;
 
   void scrollToRow(int index);
   View * cellAtIndex(int index);
diff --git a/escher/src/table_view.cpp b/escher/src/table_view.cpp
index 0cd0dfe57..945f95b32 100644
--- a/escher/src/table_view.cpp
+++ b/escher/src/table_view.cpp
@@ -12,17 +12,6 @@ TableView::TableView(TableViewDataSource * dataSource) :
   setSubview(&m_contentView, 0);
 }
 
-void TableView::layoutSubviews() {
-  KDRect frame;
-  frame.x = 0;
-  frame.y = 0;
-  frame.width = m_frame.width;
-  frame.height = 9999; // FIXME: Depends on the datasource, actually...
-  m_contentView.setFrame(frame);
-
-  ScrollView::layoutSubviews();
-}
-
 void TableView::scrollToRow(int index) {
   KDPoint contentOffset;
   contentOffset.x = 0;