See StructureIdComparator Revert "LPS-41759 Weird, but consistent. See other comparators in those same dirs."

This reverts commit 9c3b218d00808ec084979f2ef7bc9dfc1f4cbfe0.