Revert ProtoBuff related changes