Revert "Merge branch 'fix_treeview'"

This reverts commit dcf18f47943df74ffe9629441e1b669dcffd1056, reversing
changes made to 7539d36844fbf13d7be05af0fb5b8ff665386f28.