Revert "Revert "BFS 404""

This reverts commit 582e22301e9de32b1d0fbcf5ddb7facd28f31e09.