Revert "BFQ 7"

This reverts commit e18ebc2800488acc8597cfe7ac2653238e22c8c6.