Revert "Single pubsub thread for several channels"

This reverts commit 9db286f816aacef3d12ccb0021e530bc97935722.