Issue #2141119 by kim.pepper: Removed unused sort helper