Revert "BFS 427"

This reverts commit 61c6ea1dbdf685a9a87bb17b756de39a41d85a30.