Apply nodeorder patch to temp copy
Merge pull request #6602 from openscholar/6599

Fix nodeorder fatals, and remove unused code