Not really, I copied this from the passport deserializer. I'll fix it up there as well.