Fixes to properly disable "vanilla" deserialization when ObjectIdReader is not null