This reverts commit c73a1aaa90694c66feefc59557b35f5913ef1b04. The change causes an NPE when rendering ListViews.