Added back the protobuf hack