Revert "A bit more qs"

This reverts commit db721efef47b9e70e28410bfd48e34abcd2bfbe7.