Revert "Set of BFQ improvements"

This reverts commit 003f1c33d04de1d070562538138a460cac542e2e.