[BUG #8053] Replace call to node-based data generator