#3949: Remove unneeded reordering and filling in of missing data.