Block: Add BFQ back in