Revert "Fix compile error regarding BFQ-v6r2"

This reverts commit 1f11cd84152475bd6779772e1d230a86af8c5dad.