diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 423ab658..bfa61799 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -97,7 +97,7 @@ module Jekyll
       # problems and backwards-compatibility.
       def from(user_config)
         Utils.deep_merge_hashes(DEFAULTS, Configuration[user_config].stringify_keys)
-          .fix_common_issues.add_default_collections
+          .add_default_collections
       end
     end
 
@@ -210,7 +210,7 @@ module Jekyll
         warn err
       end
 
-      configuration.fix_common_issues.backwards_compatibilize.add_default_collections
+      configuration.backwards_compatibilize.add_default_collections
     end
 
     # Public: Split a CSV string into an array containing its values
@@ -246,18 +246,9 @@ module Jekyll
       config
     end
 
+    # DEPRECATED.
     def fix_common_issues
-      config = clone
-
-      if config.key?("paginate") && (!config["paginate"].is_a?(Integer) ||
-             config["paginate"] < 1)
-
-        Jekyll.logger.warn "Config Warning:", "The `paginate` key must be a positive" \
-          " integer or nil. It's currently set to '#{config["paginate"].inspect}'."
-        config["paginate"] = nil
-      end
-
-      config
+      self
     end
 
     def add_default_collections
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 3dbd5ca1..e0f1b8b5 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -20,13 +20,8 @@ class TestConfiguration < JekyllUnitTest
       assert_equal result["source"], "blah"
     end
 
-    should "fix common mistakes" do
-      result = Configuration.from({ "paginate" => 0 })
-      assert_nil(
-        result["paginate"],
-        "Expected 'paginate' to be corrected to 'nil', " \
-        "but was #{result["paginate"].inspect}"
-      )
+    should "return a valid Configuration instance" do
+      assert_instance_of Configuration, Configuration.from({}).fix_common_issues
     end
 
     should "add default collections" do
@@ -263,20 +258,6 @@ class TestConfiguration < JekyllUnitTest
       assert @config.backwards_compatibilize["plugins"]
     end
   end
-  context "#fix_common_issues" do
-    setup do
-      @config = proc do |val|
-        Configuration[{
-          "paginate" => val,
-        }]
-      end
-    end
-    should "sets an invalid 'paginate' value to nil" do
-      assert_nil @config.call(0).fix_common_issues["paginate"]
-      assert_nil @config.call(-1).fix_common_issues["paginate"]
-      assert_nil @config.call(true).fix_common_issues["paginate"]
-    end
-  end
   context "loading configuration" do
     setup do
       @path = source_dir("_config.yml")