LPS-52029 sort
Revert "LPS-52029 sort", order matters.

This reverts commit b7aedc394b8ce200fd9455bf662b9ef7bbd870e4.