VX(Li): Roll back some of the changes to re-enable the DFS and BFS.