Allow object deserialization

Change-Id: Iedeaf5810bf52cee1bc3eba548b5033ca2de0b39