revert ValueComparator to previous implementation