Reverted deserializer to fix #346