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