Bypassing the check from TokenSortCollector to allow the fix to work.