Revert "BFQ 5"

This reverts commit 3f01b9078862e7e8860033763bb42e3efbea691b.