Need to override restore_object as default implementation is broken