Revert "Default back to single queue per"

This reverts commit 81472a306cfe453ef04f55c0cb35623bc879d952.