Revert "Upgrade to BFQ V6"

This reverts commit cc74ddd6454897a0522eeaf5308e74c0dfa07851.