Fix #1517
Issue #1517: Remove LinkedHashSet and comment