Revert "BFQ 8"

This reverts commit 6fbe9177ed92d119a843dadebb5764ee30246681.