Restore NexusDataWriter (only) to point before merge from 8.38 to 8.40