Revert "BFQ: revert, something is causing a bootloop"

This reverts commit 096a8ebbff73b7af27d6aedaa31b0c18219cef81.