Switch back to simplier protobuf types, but with a type flag.