This reverts commit 242c574d because it breaks the following tests on the bots: - TestGuiExpandThreadsTree.py - TestBreakpointCallbackCommandSource.py