Revert "BFQ 4"

This reverts commit 505e4d421ac8f02d25882eccfb50d6328c995a6a.