Revert "BFQ v7r2"

This reverts commit 0b3d4ac98d9657b3927313a591205861186c17d9.
BFQ v7r4