Revert "Revert "Default back to single queue per""

This reverts commit 719ae058d8d1880af177aee49e04909a10b1e8f6.