LPS-47637 Replace new comparator with the old one to avoid code duplication