Revert "reverte peer manager singleton"

This reverts commit ceb7552a6ac0f3b9ecba5002ebceca8f0f277234.