diff --git a/lib/linguist/blob_helper.rb b/lib/linguist/blob_helper.rb
index b6ae5409..6ce4799e 100644
--- a/lib/linguist/blob_helper.rb
+++ b/lib/linguist/blob_helper.rb
@@ -43,10 +43,6 @@ module Linguist
       content_type.include?('octet') || !(text? || image?)
     end
 
-    def file?
-      image? || binary?
-    end
-
     def text?
       content_type[/(text|json)/]
     end
@@ -62,7 +58,7 @@ module Linguist
     end
 
     def viewable?
-      !file? && !large?
+      !image? && !binary? && !large?
     end
 
     def generated?
diff --git a/test/test_blob.rb b/test/test_blob.rb
index ef93d9d5..4d7fdd94 100644
--- a/test/test_blob.rb
+++ b/test/test_blob.rb
@@ -87,11 +87,6 @@ class TestBlob < Test::Unit::TestCase
     assert !blob("octocat.png").binary?
   end
 
-  def test_file
-    assert blob("octocat.png").file?
-    assert blob("linguist.gem").file?
-  end
-
   def test_text
     assert blob("file.txt").text?
     assert blob("file.json").text?
@@ -106,6 +101,12 @@ class TestBlob < Test::Unit::TestCase
     assert !blob("octocat.psd").image?
   end
 
+  def test_viewable
+    assert blob("foo.rb").viewable?
+    assert !blob("octocat.png").viewable?
+    assert !blob("linguist.gem").viewable?
+  end
+
   def test_generated
     assert !blob("README").generated?
     assert blob("MainMenu.xib").generated?