Undo fix for garbled tree view on file switch: root cause seems gone

TBR: @devoncarew 

The original problem is described in #3084; a fix was committed in #3092. I've tried to reproduce now with that fix undone, and everything seems to be working fine. Let's speculatively commit this and see what happens.