diff --git a/app/logical/downloads/file.rb b/app/logical/downloads/file.rb
index 9be7b2109..13ed9c7d5 100644
--- a/app/logical/downloads/file.rb
+++ b/app/logical/downloads/file.rb
@@ -92,8 +92,6 @@ module Downloads
     end
 
     def is_cloudflare?(url)
-      return false if ENV["SKIP_CLOUDFLARE_CHECK"]
-
       ip_addr = IPAddr.new(Resolv.getaddress(url.hostname))
       CloudflareService.new.ips.any? { |subnet| subnet.include?(ip_addr) }
     end
diff --git a/db/populate.rb b/db/populate.rb
index 44abd6bd0..c6451e7b7 100644
--- a/db/populate.rb
+++ b/db/populate.rb
@@ -95,8 +95,6 @@ CurrentUser.user = User.admins.first
 CurrentUser.ip_addr = "127.0.0.1"
 
 if Upload.count == 0
-  ENV["SKIP_CLOUDFLARE_CHECK"] = "true"
-
   puts "Creating uploads"
   1.upto(50) do |i|
     color1 = rand(4096).to_s(16)
diff --git a/test/unit/downloads/file_test.rb b/test/unit/downloads/file_test.rb
index 43b965f53..7e37787dd 100644
--- a/test/unit/downloads/file_test.rb
+++ b/test/unit/downloads/file_test.rb
@@ -4,15 +4,10 @@ module Downloads
   class FileTest < ActiveSupport::TestCase
     context "A post download" do
       setup do
-        ENV["SKIP_CLOUDFLARE_CHECK"] = "1"
         @source = "http://www.google.com/intl/en_ALL/images/logo.gif"
         @download = Downloads::File.new(@source)
       end
 
-      teardown do
-        ENV["SKIP_CLOUDFLARE_CHECK"] = nil
-      end
-
       context "for a banned IP" do
         setup do
           Resolv.expects(:getaddress).returns("127.0.0.1").at_least_once