Revert "Reordered"

This reverts commit b79b1f7c5bc543192f1f5fd003b8737389b9edc2.
Revert "Rehauled node comparison"

This reverts commit 1e1b17aee7555b633e5e94b88c1c1aa12611f7b2.
Revert "Revert "Rehauled node comparison""

This reverts commit ae0df0a3473cb921e55ad4e735e9eea7be0b965f.
Reordered again