Revert "BFQ 6"

This reverts commit 9e60bc91ced462d6bf7c8ef711cf9c6d343eeff1.