diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py
index 9535c6c10..99aab0470 100644
--- a/presubmit_canned_checks.py
+++ b/presubmit_canned_checks.py
@@ -976,33 +976,6 @@ def _GerritOwnerAndReviewers(input_api, email_regexp, approval_needed=False):
   return owner_email, reviewers
 
 
-def _CheckConstNSObject(input_api, output_api, source_file_filter):
-  """Checks to make sure no objective-c files have |const NSSomeClass*|."""
-  pattern = input_api.re.compile(
-    r'(?<!reinterpret_cast<)'
-    r'const\s+NS(?!(Point|Range|Rect|Size)\s*\*)\w*\s*\*')
-
-  def objective_c_filter(f):
-    return (source_file_filter(f) and
-            input_api.os_path.splitext(f.LocalPath())[1] in ('.h', '.m', '.mm'))
-
-  files = []
-  for f in input_api.AffectedSourceFiles(objective_c_filter):
-    contents = input_api.ReadFile(f)
-    if pattern.search(contents):
-      files.append(f)
-
-  if files:
-    if input_api.is_committing:
-      res_type = output_api.PresubmitPromptWarning
-    else:
-      res_type = output_api.PresubmitNotifyResult
-    return [ res_type('|const NSClass*| is wrong, see ' +
-                      'http://dev.chromium.org/developers/clang-mac',
-                      files) ]
-  return []
-
-
 def CheckSingletonInHeaders(input_api, output_api, source_file_filter=None):
   """Deprecated, must be removed."""
   return [
@@ -1093,9 +1066,6 @@ def PanProjectChecks(input_api, output_api,
   snapshot( "checking stray whitespace")
   results.extend(input_api.canned_checks.CheckChangeHasNoStrayWhitespace(
       input_api, output_api, source_file_filter=sources))
-  snapshot("checking nsobjects")
-  results.extend(_CheckConstNSObject(
-      input_api, output_api, source_file_filter=sources))
   snapshot("checking license")
   results.extend(input_api.canned_checks.CheckLicense(
       input_api, output_api, license_header, source_file_filter=sources))
diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py
index ebddc05af..3994188fc 100755
--- a/tests/presubmit_unittest.py
+++ b/tests/presubmit_unittest.py
@@ -2694,16 +2694,17 @@ class CannedChecksUnittest(PresubmitTestsBase):
           ).AndReturn([affected_file])
       affected_file.LocalPath()
       affected_file.NewContents().AndReturn('Hey!\nHo!\nHey!\nHo!\n\n')
+    # CheckChangeHasNoTabs() calls _FindNewViolationsOfRule() which calls
+    # ChangedContents().
     affected_file.ChangedContents().AndReturn([
         (0, 'Hey!\n'),
         (1, 'Ho!\n'),
         (2, 'Hey!\n'),
         (3, 'Ho!\n'),
         (4, '\n')])
-    for _ in range(5):
+    for _ in range(5):  # One for each ChangedContents().
       affected_file.LocalPath().AndReturn('hello.py')
-    input_api.AffectedSourceFiles(mox.IgnoreArg()).AndReturn([affected_file])
-    input_api.ReadFile(affected_file).AndReturn('Hey!\nHo!\nHey!\nHo!\n\n')
+    # CheckingLicense() calls AffectedSourceFiles() instead of AffectedFiles().
     input_api.AffectedSourceFiles(mox.IgnoreArg()).AndReturn([affected_file])
     input_api.ReadFile(affected_file, 'rb').AndReturn(
         'Hey!\nHo!\nHey!\nHo!\n\n')