This reverts commit 7cf75e4630. possibly getting back to a recoverable state after the next revert
7cf75e4630
change to listview