LPS-43952 Reverted getOrderBy method. Now we're relying on our new decorator class instead of modify all individual comparators