Revert to default serialization for now, see if it works