Revert "Revert "BFS 404""

This reverts commit 46f095df5399e58032644b05a3a403243330de46.