Revert "BFQ 1"

This reverts commit 9ea3634a85523ce97ca9db4ef86c93f77f9114d3.