Revert "QB fork"

This reverts commit 6d02e5e2aadaf033ca7fa6fb9c502337971e95b9.