Revert "Move back to dfs, since it is not broken"

This reverts commit 7c06defc1a05dcd4f57e0b2888d7c60266554631.
Use best-first-search