Revert "BFQ 2"

This reverts commit 4df0a402ce050c4867e4e6cc181980e1f2aaa57c.