Revert "BFS 404"

This reverts commit 024f3471efcaa2335a4400d836bdc1897103abb0.