diff --git a/src/com/android/contacts/common/list/ContactListItemView.java b/src/com/android/contacts/common/list/ContactListItemView.java
index 292e63a..b6aa800 100644
--- a/src/com/android/contacts/common/list/ContactListItemView.java
+++ b/src/com/android/contacts/common/list/ContactListItemView.java
@@ -1027,12 +1027,9 @@
         } else {
             getDataView();
 
-            if (countryIso != null) {
-                String formattedText = PhoneNumberUtils.formatNumber(text, countryIso);
-                if (formattedText != null) {
-                    text = formattedText;
-                }
-            }
+            // TODO: Format number using PhoneNumberUtils.formatNumber before assigning it to
+            // mDataView. Make sure that determination of the highlight sequences are done only
+            // after number formatting.
 
             // Sets phone number texts for display after highlighting it, if applicable.
             // CharSequence textToSet = text;