Revert "Changes in ProtoManager"

This reverts commit 2881c6b418bbaa18d6c500018116e8dcaa6ad615.