Revert "fixes for kernel to compile with BFS"

This reverts commit f4a28055622d9421140e61f819d2bf54e0890973.
Revert "BFS 404"

This reverts commit e962d4e154a5f7a08a96bab8bd339e794c78f11b.