Revert "Added/removed missing links and ProtoBuf support"

This reverts commit d668628579a534271a7c7a2d280d71a0590e5e1a.