LPS-33754
LPS-33754 Undo unnecessary sorting (the original was correct)
LPS-33754 SF