Revert "Use PubSubClient in submodule"

This reverts commit a6f825c7d5c01f2bc390cab24b587e9cfe4496bf.
Revert "Use submodule version"

This reverts commit 25c6b9fd2e3d459a9a35f840b1f5bb5fe911ac3d.