Revert "Update BFQ to v6-r2"

This reverts commit f61a5f6d48a19ae36ce0ad16ee320ed8ccc36ad6.