Revert "BFS 428"

This reverts commit 60c562122764a9e9c40196534dc2d6ca2497289c.