Revert "BFQ 3"

This reverts commit 89f4c3cb4a71b72fb2cf141e0d5cda89289fef3a.